aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs11
1 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index b819581..5d08764 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Tests.Common.Setup
135 LocalAssetServicesConnector assetService = StartAssetService(testScene); 135 LocalAssetServicesConnector assetService = StartAssetService(testScene);
136 StartAuthenticationService(testScene); 136 StartAuthenticationService(testScene);
137 LocalInventoryServicesConnector inventoryService = StartInventoryService(testScene); 137 LocalInventoryServicesConnector inventoryService = StartInventoryService(testScene);
138 StartGridService(testScene, true); 138 StartGridService(testScene);
139 LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene); 139 LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene);
140 LocalPresenceServicesConnector presenceService = StartPresenceService(testScene); 140 LocalPresenceServicesConnector presenceService = StartPresenceService(testScene);
141 141
@@ -218,24 +218,19 @@ namespace OpenSim.Tests.Common.Setup
218 return inventoryService; 218 return inventoryService;
219 } 219 }
220 220
221 private static LocalGridServicesConnector StartGridService(Scene testScene, bool real) 221 private static LocalGridServicesConnector StartGridService(Scene testScene)
222 { 222 {
223 IConfigSource config = new IniConfigSource(); 223 IConfigSource config = new IniConfigSource();
224 config.AddConfig("Modules"); 224 config.AddConfig("Modules");
225 config.AddConfig("GridService"); 225 config.AddConfig("GridService");
226 config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector"); 226 config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector");
227 config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullRegionData"); 227 config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullRegionData");
228 if (real) 228 config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService");
229 config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService");
230 229
231 LocalGridServicesConnector gridService = new LocalGridServicesConnector(); 230 LocalGridServicesConnector gridService = new LocalGridServicesConnector();
232 gridService.Initialise(config); 231 gridService.Initialise(config);
233
234 //else
235 // config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestGridService");
236 gridService.AddRegion(testScene); 232 gridService.AddRegion(testScene);
237 gridService.RegionLoaded(testScene); 233 gridService.RegionLoaded(testScene);
238 //testScene.AddRegionModule(m_gridService.Name, m_gridService);
239 234
240 return gridService; 235 return gridService;
241 } 236 }