aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
diff options
context:
space:
mode:
authorAliciaRaven2014-09-06 05:19:12 +0100
committerJustin Clark-Casey (justincc)2014-09-23 00:04:50 +0100
commit08675d44a754156ecdfd09d01ae1209bf73e2533 (patch)
treeb67c465a45e32b4055348b5c20aee0e721fc736b /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
parentInclude same content filters for IAR file exports that already exist for OAR ... (diff)
downloadopensim-SC_OLD-08675d44a754156ecdfd09d01ae1209bf73e2533.zip
opensim-SC_OLD-08675d44a754156ecdfd09d01ae1209bf73e2533.tar.gz
opensim-SC_OLD-08675d44a754156ecdfd09d01ae1209bf73e2533.tar.bz2
opensim-SC_OLD-08675d44a754156ecdfd09d01ae1209bf73e2533.tar.xz
Change existing IAR save to use UUID for its callback reference instead of Guid. This is for uniformity as discussed on IRC.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
index b85739e..254aa11 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
110 110
111 mre.Reset(); 111 mre.Reset();
112 m_archiverModule.ArchiveInventory( 112 m_archiverModule.ArchiveInventory(
113 Guid.NewGuid(), userFirstName, userLastName, "/", userPassword, archiveWriteStream); 113 UUID.Random(), userFirstName, userLastName, "/", userPassword, archiveWriteStream);
114 mre.WaitOne(60000, false); 114 mre.WaitOne(60000, false);
115 115
116 // Test created iar 116 // Test created iar
@@ -179,7 +179,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
179 179
180 mre.Reset(); 180 mre.Reset();
181 m_archiverModule.ArchiveInventory( 181 m_archiverModule.ArchiveInventory(
182 Guid.NewGuid(), userFirstName, userLastName, "f1", userPassword, archiveWriteStream); 182 UUID.Random(), userFirstName, userLastName, "f1", userPassword, archiveWriteStream);
183 mre.WaitOne(60000, false); 183 mre.WaitOne(60000, false);
184 184
185 // Test created iar 185 // Test created iar
@@ -267,7 +267,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
267 267
268 mre.Reset(); 268 mre.Reset();
269 m_archiverModule.ArchiveInventory( 269 m_archiverModule.ArchiveInventory(
270 Guid.NewGuid(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream); 270 UUID.Random(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream);
271 mre.WaitOne(60000, false); 271 mre.WaitOne(60000, false);
272 272
273 byte[] archive = archiveWriteStream.ToArray(); 273 byte[] archive = archiveWriteStream.ToArray();
@@ -364,7 +364,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
364 364
365 // When we're not saving assets, archiving is being done synchronously. 365 // When we're not saving assets, archiving is being done synchronously.
366 m_archiverModule.ArchiveInventory( 366 m_archiverModule.ArchiveInventory(
367 Guid.NewGuid(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream, options); 367 UUID.Random(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream, options);
368 368
369 byte[] archive = archiveWriteStream.ToArray(); 369 byte[] archive = archiveWriteStream.ToArray();
370 MemoryStream archiveReadStream = new MemoryStream(archive); 370 MemoryStream archiveReadStream = new MemoryStream(archive);