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.cs17
1 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 95f5e3c..53f24d9 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -249,21 +249,24 @@ namespace OpenSim.Tests.Common.Setup
249 249
250 private static void StartGridService(Scene testScene, bool real) 250 private static void StartGridService(Scene testScene, bool real)
251 { 251 {
252 ISharedRegionModule gridService = new LocalGridServicesConnector();
253 IConfigSource config = new IniConfigSource(); 252 IConfigSource config = new IniConfigSource();
254 config.AddConfig("Modules"); 253 config.AddConfig("Modules");
255 config.AddConfig("GridService"); 254 config.AddConfig("GridService");
256 config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector"); 255 config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector");
256 config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullRegionData");
257 if (real) 257 if (real)
258 config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService"); 258 config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService");
259 if (m_gridService == null)
260 {
261 ISharedRegionModule gridService = new LocalGridServicesConnector();
262 gridService.Initialise(config);
263 m_gridService = gridService;
264 }
259 //else 265 //else
260 // config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestGridService"); 266 // config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestGridService");
261 config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullRegionData"); 267 m_gridService.AddRegion(testScene);
262 gridService.Initialise(config); 268 m_gridService.RegionLoaded(testScene);
263 gridService.AddRegion(testScene); 269 //testScene.AddRegionModule(m_gridService.Name, m_gridService);
264 gridService.RegionLoaded(testScene);
265 testScene.AddRegionModule(gridService.Name, gridService);
266 m_gridService = gridService;
267 } 270 }
268 271
269 272