aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs12
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
index 3ec5e53..5ec7bc4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
@@ -93,8 +93,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
93 93
94 Scene scene = SceneSetupHelpers.SetupScene("Inventory"); 94 Scene scene = SceneSetupHelpers.SetupScene("Inventory");
95 UserProfileTestUtils.CreateUserWithInventory(scene, m_ua2, "hampshire"); 95 UserProfileTestUtils.CreateUserWithInventory(scene, m_ua2, "hampshire");
96
97 string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(m_item1Name, UUID.Random());
98 96
99 MemoryStream archiveWriteStream = new MemoryStream(); 97 MemoryStream archiveWriteStream = new MemoryStream();
100 TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); 98 TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
@@ -106,10 +104,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
106 item1.CreatorIdAsUuid = m_ua2.PrincipalID; 104 item1.CreatorIdAsUuid = m_ua2.PrincipalID;
107 item1.Owner = UUID.Zero; 105 item1.Owner = UUID.Zero;
108 106
109 string item1FileName 107 string archiveItem1Name = InventoryArchiveWriteRequest.CreateArchiveItemName(m_item1Name, UUID.Random());
110 = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName); 108 string archiveItem1Path = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItem1Name);
111 tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1, new Dictionary<string, object>(), scene.UserAccountService)); 109 tar.WriteFile(
110 archiveItem1Path,
111 UserInventoryItemSerializer.Serialize(
112 item1, new Dictionary<string, object>(), scene.UserAccountService));
112 tar.Close(); 113 tar.Close();
114
113 m_iarStreamBytes = archiveWriteStream.ToArray(); 115 m_iarStreamBytes = archiveWriteStream.ToArray();
114 } 116 }
115 117