aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
diff options
context:
space:
mode:
authordiva2009-06-10 13:46:38 +0000
committerdiva2009-06-10 13:46:38 +0000
commit8dc9f18e7ce661082201892e28d021b70fac3d95 (patch)
tree0ae999af9a5b86fea9adcfff566511a400cd7767 /OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
parentAttempt at disabling the inventory unit tests, so I can figure out how to fix... (diff)
downloadopensim-SC-8dc9f18e7ce661082201892e28d021b70fac3d95.zip
opensim-SC-8dc9f18e7ce661082201892e28d021b70fac3d95.tar.gz
opensim-SC-8dc9f18e7ce661082201892e28d021b70fac3d95.tar.bz2
opensim-SC-8dc9f18e7ce661082201892e28d021b70fac3d95.tar.xz
Attempt at fixing the inventory archiver tests.
Diffstat (limited to '')
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs16
1 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 51ee7b3..de5dd83 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -41,6 +41,7 @@ using OpenSim.Region.Framework.Scenes;
41using OpenSim.Region.CoreModules.Agent.Capabilities; 41using OpenSim.Region.CoreModules.Agent.Capabilities;
42using OpenSim.Region.CoreModules.Avatar.Gods; 42using OpenSim.Region.CoreModules.Avatar.Gods;
43using OpenSim.Region.CoreModules.ServiceConnectors.Asset; 43using OpenSim.Region.CoreModules.ServiceConnectors.Asset;
44using OpenSim.Region.CoreModules.ServiceConnectors.Inventory;
44using OpenSim.Services.Interfaces; 45using OpenSim.Services.Interfaces;
45using OpenSim.Tests.Common.Mock; 46using OpenSim.Tests.Common.Mock;
46 47
@@ -138,7 +139,20 @@ namespace OpenSim.Tests.Common.Setup
138 assetService.RegionLoaded(testScene); 139 assetService.RegionLoaded(testScene);
139 testScene.AddRegionModule(assetService.Name, assetService); 140 testScene.AddRegionModule(assetService.Name, assetService);
140 assetService.PostInitialise(); 141 assetService.PostInitialise();
141 142
143 ISharedRegionModule inventoryService = new LocalInventoryServicesConnector();
144 config = new IniConfigSource();
145 config.AddConfig("Modules");
146 config.AddConfig("InventoryService");
147 config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector");
148 config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:AssetService");
149 config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
150 assetService.Initialise(config);
151 assetService.AddRegion(testScene);
152 assetService.RegionLoaded(testScene);
153 testScene.AddRegionModule(inventoryService.Name, inventoryService);
154 assetService.PostInitialise();
155
142 testScene.SetModuleInterfaces(); 156 testScene.SetModuleInterfaces();
143 157
144 testScene.LandChannel = new TestLandChannel(); 158 testScene.LandChannel = new TestLandChannel();