diff options
author | Melanie | 2012-11-11 16:31:01 +0000 |
---|---|---|
committer | Melanie | 2012-11-11 16:31:01 +0000 |
commit | 389077345f9fc78fddcaa39e29daa532a32815d6 (patch) | |
tree | a455d88d93ac5fe984ebf5342276ca1ddc831442 /OpenSim/Tests/Common | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Deleted 2 obsolete modules: OGSRadmin and OpenGridProtocol. They were still I... (diff) | |
download | opensim-SC_OLD-389077345f9fc78fddcaa39e29daa532a32815d6.zip opensim-SC_OLD-389077345f9fc78fddcaa39e29daa532a32815d6.tar.gz opensim-SC_OLD-389077345f9fc78fddcaa39e29daa532a32815d6.tar.bz2 opensim-SC_OLD-389077345f9fc78fddcaa39e29daa532a32815d6.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index fc49169..f9c1ac2 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -141,9 +141,9 @@ namespace OpenSim.Tests.Common | |||
141 | TestScene testScene = new TestScene( | 141 | TestScene testScene = new TestScene( |
142 | regInfo, m_acm, scs, m_simDataService, m_estateDataService, null, false, configSource, null); | 142 | regInfo, m_acm, scs, m_simDataService, m_estateDataService, null, false, configSource, null); |
143 | 143 | ||
144 | IRegionModule godsModule = new GodsModule(); | 144 | INonSharedRegionModule godsModule = new GodsModule(); |
145 | godsModule.Initialise(testScene, new IniConfigSource()); | 145 | godsModule.Initialise(new IniConfigSource()); |
146 | testScene.AddModule(godsModule.Name, godsModule); | 146 | godsModule.AddRegion(testScene); |
147 | 147 | ||
148 | // Add scene to services | 148 | // Add scene to services |
149 | m_assetService.AddRegion(testScene); | 149 | m_assetService.AddRegion(testScene); |
@@ -385,18 +385,18 @@ namespace OpenSim.Tests.Common | |||
385 | 385 | ||
386 | foreach (IRegionModuleBase module in newModules) | 386 | foreach (IRegionModuleBase module in newModules) |
387 | { | 387 | { |
388 | if (module is ISharedRegionModule) ((ISharedRegionModule)module).PostInitialise(); | ||
389 | } | ||
390 | |||
391 | foreach (IRegionModuleBase module in newModules) | ||
392 | { | ||
393 | foreach (Scene scene in scenes) | 388 | foreach (Scene scene in scenes) |
394 | { | 389 | { |
395 | module.AddRegion(scene); | 390 | module.AddRegion(scene); |
396 | scene.AddRegionModule(module.Name, module); | 391 | scene.AddRegionModule(module.Name, module); |
397 | } | 392 | } |
398 | } | 393 | } |
399 | 394 | ||
395 | foreach (IRegionModuleBase module in newModules) | ||
396 | { | ||
397 | if (module is ISharedRegionModule) ((ISharedRegionModule)module).PostInitialise(); | ||
398 | } | ||
399 | |||
400 | // RegionLoaded is fired after all modules have been appropriately added to all scenes | 400 | // RegionLoaded is fired after all modules have been appropriately added to all scenes |
401 | foreach (IRegionModuleBase module in newModules) | 401 | foreach (IRegionModuleBase module in newModules) |
402 | foreach (Scene scene in scenes) | 402 | foreach (Scene scene in scenes) |