aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-08-11 12:31:02 -0700
committerDiva Canto2009-08-11 12:31:02 -0700
commit764ec7ba0ae33048f98271e0efc5985ace574da5 (patch)
treee81689a2d3aa6d0c8c5ca4b6a3185960be38d75c
parentAdded http handlers for the two new inventory operations. (diff)
parentDo new inventory module setup, which is why the test was failing (not the ori... (diff)
downloadopensim-SC_OLD-764ec7ba0ae33048f98271e0efc5985ace574da5.zip
opensim-SC_OLD-764ec7ba0ae33048f98271e0efc5985ace574da5.tar.gz
opensim-SC_OLD-764ec7ba0ae33048f98271e0efc5985ace574da5.tar.bz2
opensim-SC_OLD-764ec7ba0ae33048f98271e0efc5985ace574da5.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index c04ce08..28b4d64 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -386,7 +386,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
386 386
387 log4net.Config.XmlConfigurator.Configure(); 387 log4net.Config.XmlConfigurator.Configure();
388 388
389 Scene scene = SceneSetupHelpers.SetupScene(""); 389 Scene scene = SceneSetupHelpers.SetupScene("inventory");
390 CommunicationsManager commsManager = scene.CommsManager; 390 CommunicationsManager commsManager = scene.CommsManager;
391 CachedUserInfo userInfo; 391 CachedUserInfo userInfo;
392 392