| /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs |
|---|
| @@ -70,7 +70,7 @@ |
|---|
| UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "meowfood"); |
| UserAccountHelpers.CreateUserWithInventory(scene, m_uaLL1, "hampshire"); |
| |
| archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", m_iarStream); |
| archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream); |
| InventoryItemBase foundItem1 |
| = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, m_item1Name); |
| |
| @@ -79,7 +79,7 @@ |
|---|
| // Now try loading to a root child folder |
| UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, m_uaMT.PrincipalID, "xA", false); |
| MemoryStream archiveReadStream = new MemoryStream(m_iarStream.ToArray()); |
| archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xA", archiveReadStream); |
| archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xA", "meowfood", archiveReadStream); |
| |
| InventoryItemBase foundItem2 |
| = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, "xA/" + m_item1Name); |
| @@ -88,7 +88,7 @@ |
|---|
| // Now try loading to a more deeply nested folder |
| UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, m_uaMT.PrincipalID, "xB/xC", false); |
| archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); |
| archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xB/xC", archiveReadStream); |
| archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xB/xC", "meowfood", archiveReadStream); |
| |
| InventoryItemBase foundItem3 |
| = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, "xB/xC/" + m_item1Name); |
| @@ -110,7 +110,7 @@ |
|---|
| SceneHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); |
| |
| UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "password"); |
| archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/Objects", m_iarStream); |
| archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/Objects", "password", m_iarStream); |
| |
| InventoryItemBase foundItem1 |
| = InventoryArchiveUtils.FindItemByPath( |
| @@ -127,6 +127,7 @@ |
|---|
| |
| string itemName = "You & you are a mean/man/"; |
| string humanEscapedItemName = @"You & you are a mean\/man\/"; |
| string userPassword = "meowfood"; |
| |
| InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
| |
| @@ -179,13 +180,13 @@ |
|---|
| |
| mre.Reset(); |
| archiverModule.ArchiveInventory( |
| Guid.NewGuid(), userFirstName, userLastName, "Objects", archiveWriteStream); |
| Guid.NewGuid(), userFirstName, userLastName, "Objects", userPassword, archiveWriteStream); |
| mre.WaitOne(60000, false); |
| |
| // LOAD ITEM |
| MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); |
| |
| archiverModule.DearchiveInventory(userFirstName, userLastName, "Scripts", archiveReadStream); |
| archiverModule.DearchiveInventory(userFirstName, userLastName, "Scripts", userPassword, archiveReadStream); |
| |
| InventoryItemBase foundItem1 |
| = InventoryArchiveUtils.FindItemByPath( |
