From 631654a38d2ace833f8cd2dc3b6b3860352f8b13 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 15 Apr 2011 01:30:49 +0100
Subject: remove old code for a mock grid service, which got removed some time
back
---
OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
(limited to 'OpenSim')
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
LocalAssetServicesConnector assetService = StartAssetService(testScene);
StartAuthenticationService(testScene);
LocalInventoryServicesConnector inventoryService = StartInventoryService(testScene);
- StartGridService(testScene, true);
+ StartGridService(testScene);
LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene);
LocalPresenceServicesConnector presenceService = StartPresenceService(testScene);
@@ -218,24 +218,19 @@ namespace OpenSim.Tests.Common.Setup
return inventoryService;
}
- private static LocalGridServicesConnector StartGridService(Scene testScene, bool real)
+ private static LocalGridServicesConnector StartGridService(Scene testScene)
{
IConfigSource config = new IniConfigSource();
config.AddConfig("Modules");
config.AddConfig("GridService");
config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector");
config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullRegionData");
- if (real)
- config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService");
+ config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService");
LocalGridServicesConnector gridService = new LocalGridServicesConnector();
gridService.Initialise(config);
-
- //else
- // config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestGridService");
gridService.AddRegion(testScene);
gridService.RegionLoaded(testScene);
- //testScene.AddRegionModule(m_gridService.Name, m_gridService);
return gridService;
}
--
cgit v1.1