diff options
author | Diva Canto | 2009-09-28 17:33:34 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-28 17:33:34 -0700 |
commit | 4eca59ec13bb48309120fea24890341c65157c65 (patch) | |
tree | 339df84cb98625c274fe03ef17bb4a5e808e379b /OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |
parent | Reorder prebuild stuff to make panda eat bamboo in peace (diff) | |
download | opensim-SC_OLD-4eca59ec13bb48309120fea24890341c65157c65.zip opensim-SC_OLD-4eca59ec13bb48309120fea24890341c65157c65.tar.gz opensim-SC_OLD-4eca59ec13bb48309120fea24890341c65157c65.tar.bz2 opensim-SC_OLD-4eca59ec13bb48309120fea24890341c65157c65.tar.xz |
Improved the Local grid connector to fetch data from the DB when it doesn't find it in the cache.
Commented out the Standalone teleport test because it's failing, and the scene setup is very confusing. I suspect it may be wrong -- the connectors-as-ISharedRegionModules are being instantiated several times when there are several scenes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index 0d8baad..95f5e3c 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
@@ -44,6 +44,7 @@ using OpenSim.Region.CoreModules.Agent.Capabilities; | |||
44 | using OpenSim.Region.CoreModules.Avatar.Gods; | 44 | using OpenSim.Region.CoreModules.Avatar.Gods; |
45 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset; | 45 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset; |
46 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory; | 46 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory; |
47 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid; | ||
47 | using OpenSim.Services.Interfaces; | 48 | using OpenSim.Services.Interfaces; |
48 | using OpenSim.Tests.Common.Mock; | 49 | using OpenSim.Tests.Common.Mock; |
49 | 50 | ||
@@ -58,6 +59,7 @@ namespace OpenSim.Tests.Common.Setup | |||
58 | // CommunicationsManager. | 59 | // CommunicationsManager. |
59 | private static ISharedRegionModule m_assetService = null; | 60 | private static ISharedRegionModule m_assetService = null; |
60 | private static ISharedRegionModule m_inventoryService = null; | 61 | private static ISharedRegionModule m_inventoryService = null; |
62 | private static ISharedRegionModule m_gridService = null; | ||
61 | private static TestCommunicationsManager commsManager = null; | 63 | private static TestCommunicationsManager commsManager = null; |
62 | 64 | ||
63 | /// <summary> | 65 | /// <summary> |
@@ -110,6 +112,7 @@ namespace OpenSim.Tests.Common.Setup | |||
110 | return SetupScene(name, id, x, y, cm, ""); | 112 | return SetupScene(name, id, x, y, cm, ""); |
111 | } | 113 | } |
112 | 114 | ||
115 | |||
113 | /// <summary> | 116 | /// <summary> |
114 | /// Set up a scene. If it's more then one scene, use the same CommunicationsManager to link regions | 117 | /// Set up a scene. If it's more then one scene, use the same CommunicationsManager to link regions |
115 | /// or a different, to get a brand new scene with new shared region modules. | 118 | /// or a different, to get a brand new scene with new shared region modules. |
@@ -176,6 +179,9 @@ namespace OpenSim.Tests.Common.Setup | |||
176 | StartInventoryService(testScene, true); | 179 | StartInventoryService(testScene, true); |
177 | else | 180 | else |
178 | StartInventoryService(testScene, false); | 181 | StartInventoryService(testScene, false); |
182 | if (realServices.Contains("grid")) | ||
183 | StartGridService(testScene, true); | ||
184 | |||
179 | } | 185 | } |
180 | // If not, make sure the shared module gets references to this new scene | 186 | // If not, make sure the shared module gets references to this new scene |
181 | else | 187 | else |
@@ -241,6 +247,26 @@ namespace OpenSim.Tests.Common.Setup | |||
241 | m_inventoryService = inventoryService; | 247 | m_inventoryService = inventoryService; |
242 | } | 248 | } |
243 | 249 | ||
250 | private static void StartGridService(Scene testScene, bool real) | ||
251 | { | ||
252 | ISharedRegionModule gridService = new LocalGridServicesConnector(); | ||
253 | IConfigSource config = new IniConfigSource(); | ||
254 | config.AddConfig("Modules"); | ||
255 | config.AddConfig("GridService"); | ||
256 | config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector"); | ||
257 | if (real) | ||
258 | config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService"); | ||
259 | //else | ||
260 | // config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestGridService"); | ||
261 | config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullRegionData"); | ||
262 | gridService.Initialise(config); | ||
263 | gridService.AddRegion(testScene); | ||
264 | gridService.RegionLoaded(testScene); | ||
265 | testScene.AddRegionModule(gridService.Name, gridService); | ||
266 | m_gridService = gridService; | ||
267 | } | ||
268 | |||
269 | |||
244 | /// <summary> | 270 | /// <summary> |
245 | /// Setup modules for a scene using their default settings. | 271 | /// Setup modules for a scene using their default settings. |
246 | /// </summary> | 272 | /// </summary> |