diff options
| author | Diva Canto | 2009-08-11 12:31:02 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-08-11 12:31:02 -0700 |
| commit | 764ec7ba0ae33048f98271e0efc5985ace574da5 (patch) | |
| tree | e81689a2d3aa6d0c8c5ca4b6a3185960be38d75c /OpenSim | |
| parent | Added http handlers for the two new inventory operations. (diff) | |
| parent | Do new inventory module setup, which is why the test was failing (not the ori... (diff) | |
| download | opensim-SC-764ec7ba0ae33048f98271e0efc5985ace574da5.zip opensim-SC-764ec7ba0ae33048f98271e0efc5985ace574da5.tar.gz opensim-SC-764ec7ba0ae33048f98271e0efc5985ace574da5.tar.bz2 opensim-SC-764ec7ba0ae33048f98271e0efc5985ace574da5.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 2 |
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 | ||