diff options
author | Diva Canto | 2010-12-10 23:16:47 -0800 |
---|---|---|
committer | Diva Canto | 2010-12-10 23:16:47 -0800 |
commit | 18b10fab609787bc1bb1284fe174a900ab588e49 (patch) | |
tree | 0d612c1c63927d9a59f34e3129031033526c2edd /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests | |
parent | Another stab at mantis #5256 (diff) | |
parent | Remove the restriction that you have to be logged in when loading/saving iars (diff) | |
download | opensim-SC_OLD-18b10fab609787bc1bb1284fe174a900ab588e49.zip opensim-SC_OLD-18b10fab609787bc1bb1284fe174a900ab588e49.tar.gz opensim-SC_OLD-18b10fab609787bc1bb1284fe174a900ab588e49.tar.bz2 opensim-SC_OLD-18b10fab609787bc1bb1284fe174a900ab588e49.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index 2747e15..76d0b85 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -120,7 +120,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
120 | TestHelper.InMethod(); | 120 | TestHelper.InMethod(); |
121 | // log4net.Config.XmlConfigurator.Configure(); | 121 | // log4net.Config.XmlConfigurator.Configure(); |
122 | 122 | ||
123 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); | 123 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
124 | 124 | ||
125 | Scene scene = SceneSetupHelpers.SetupScene("Inventory"); | 125 | Scene scene = SceneSetupHelpers.SetupScene("Inventory"); |
126 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule); | 126 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule); |
@@ -238,7 +238,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
238 | TestHelper.InMethod(); | 238 | TestHelper.InMethod(); |
239 | // log4net.Config.XmlConfigurator.Configure(); | 239 | // log4net.Config.XmlConfigurator.Configure(); |
240 | 240 | ||
241 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); | 241 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
242 | 242 | ||
243 | Scene scene = SceneSetupHelpers.SetupScene("Inventory"); | 243 | Scene scene = SceneSetupHelpers.SetupScene("Inventory"); |
244 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule); | 244 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule); |
@@ -355,7 +355,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
355 | // log4net.Config.XmlConfigurator.Configure(); | 355 | // log4net.Config.XmlConfigurator.Configure(); |
356 | 356 | ||
357 | SerialiserModule serialiserModule = new SerialiserModule(); | 357 | SerialiserModule serialiserModule = new SerialiserModule(); |
358 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); | 358 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
359 | Scene scene = SceneSetupHelpers.SetupScene("inventory"); | 359 | Scene scene = SceneSetupHelpers.SetupScene("inventory"); |
360 | SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); | 360 | SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); |
361 | 361 | ||
@@ -382,7 +382,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
382 | //log4net.Config.XmlConfigurator.Configure(); | 382 | //log4net.Config.XmlConfigurator.Configure(); |
383 | 383 | ||
384 | SerialiserModule serialiserModule = new SerialiserModule(); | 384 | SerialiserModule serialiserModule = new SerialiserModule(); |
385 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); | 385 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
386 | 386 | ||
387 | // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene | 387 | // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene |
388 | Scene scene = SceneSetupHelpers.SetupScene("inventory"); | 388 | Scene scene = SceneSetupHelpers.SetupScene("inventory"); |
@@ -443,7 +443,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
443 | string humanEscapedItemName = @"You & you are a mean\/man\/"; | 443 | string humanEscapedItemName = @"You & you are a mean\/man\/"; |
444 | string userPassword = "meowfood"; | 444 | string userPassword = "meowfood"; |
445 | 445 | ||
446 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); | 446 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
447 | 447 | ||
448 | Scene scene = SceneSetupHelpers.SetupScene("Inventory"); | 448 | Scene scene = SceneSetupHelpers.SetupScene("Inventory"); |
449 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule); | 449 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule); |
@@ -558,7 +558,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
558 | 558 | ||
559 | MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); | 559 | MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); |
560 | SerialiserModule serialiserModule = new SerialiserModule(); | 560 | SerialiserModule serialiserModule = new SerialiserModule(); |
561 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); | 561 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
562 | 562 | ||
563 | // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene | 563 | // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene |
564 | Scene scene = SceneSetupHelpers.SetupScene("inventory"); | 564 | Scene scene = SceneSetupHelpers.SetupScene("inventory"); |
@@ -619,7 +619,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
619 | 619 | ||
620 | // MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); | 620 | // MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); |
621 | // SerialiserModule serialiserModule = new SerialiserModule(); | 621 | // SerialiserModule serialiserModule = new SerialiserModule(); |
622 | // InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); | 622 | // InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
623 | 623 | ||
624 | // // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene | 624 | // // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene |
625 | // Scene scene = SceneSetupHelpers.SetupScene(); | 625 | // Scene scene = SceneSetupHelpers.SetupScene(); |