diff options
author | Teravus Ovares (Dan Olivares) | 2009-11-22 22:05:26 -0500 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-11-22 22:05:26 -0500 |
commit | 94cb4b486a7c72841ccbcec403fc7b8c95c1249a (patch) | |
tree | 176ada6e4259c076ab6942b4c96538d868880281 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests | |
parent | * Adds a test for if the collision is at the bottom of the capsule on avatar.... (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.zip opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.gz opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.bz2 opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index f8a010c..7927352 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -133,7 +133,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
133 | InventoryFolderBase objsFolder | 133 | InventoryFolderBase objsFolder |
134 | = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects"); | 134 | = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects"); |
135 | item1.Folder = objsFolder.ID; | 135 | item1.Folder = objsFolder.ID; |
136 | scene.AddInventoryItem(userId, item1); | 136 | scene.AddInventoryItem(userId, item1); |
137 | 137 | ||
138 | MemoryStream archiveWriteStream = new MemoryStream(); | 138 | MemoryStream archiveWriteStream = new MemoryStream(); |
139 | archiverModule.OnInventoryArchiveSaved += SaveCompleted; | 139 | archiverModule.OnInventoryArchiveSaved += SaveCompleted; |
@@ -348,7 +348,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
348 | InventoryFolderBase objsFolder | 348 | InventoryFolderBase objsFolder |
349 | = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects"); | 349 | = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects"); |
350 | item1.Folder = objsFolder.ID; | 350 | item1.Folder = objsFolder.ID; |
351 | scene.AddInventoryItem(userId, item1); | 351 | scene.AddInventoryItem(userId, item1); |
352 | 352 | ||
353 | MemoryStream archiveWriteStream = new MemoryStream(); | 353 | MemoryStream archiveWriteStream = new MemoryStream(); |
354 | archiverModule.OnInventoryArchiveSaved += SaveCompleted; | 354 | archiverModule.OnInventoryArchiveSaved += SaveCompleted; |
@@ -356,7 +356,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
356 | mre.Reset(); | 356 | mre.Reset(); |
357 | archiverModule.ArchiveInventory( | 357 | archiverModule.ArchiveInventory( |
358 | Guid.NewGuid(), userFirstName, userLastName, "Objects", userPassword, archiveWriteStream); | 358 | Guid.NewGuid(), userFirstName, userLastName, "Objects", userPassword, archiveWriteStream); |
359 | mre.WaitOne(60000, false); | 359 | mre.WaitOne(60000, false); |
360 | 360 | ||
361 | // LOAD ITEM | 361 | // LOAD ITEM |
362 | MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); | 362 | MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); |
@@ -373,7 +373,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
373 | // "Loaded item non-uuid creator doesn't match that of the loading user"); | 373 | // "Loaded item non-uuid creator doesn't match that of the loading user"); |
374 | Assert.That( | 374 | Assert.That( |
375 | foundItem1.Name, Is.EqualTo(itemName), | 375 | foundItem1.Name, Is.EqualTo(itemName), |
376 | "Loaded item name doesn't match saved name"); | 376 | "Loaded item name doesn't match saved name"); |
377 | } | 377 | } |
378 | 378 | ||
379 | /// <summary> | 379 | /// <summary> |