diff options
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 16 |
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; | |||
41 | using OpenSim.Region.CoreModules.Agent.Capabilities; | 41 | using OpenSim.Region.CoreModules.Agent.Capabilities; |
42 | using OpenSim.Region.CoreModules.Avatar.Gods; | 42 | using OpenSim.Region.CoreModules.Avatar.Gods; |
43 | using OpenSim.Region.CoreModules.ServiceConnectors.Asset; | 43 | using OpenSim.Region.CoreModules.ServiceConnectors.Asset; |
44 | using OpenSim.Region.CoreModules.ServiceConnectors.Inventory; | ||
44 | using OpenSim.Services.Interfaces; | 45 | using OpenSim.Services.Interfaces; |
45 | using OpenSim.Tests.Common.Mock; | 46 | using 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(); |