diff options
Diffstat (limited to 'OpenSim/Tests/Common/Helpers/SceneHelpers.cs')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index db0a7fc..939fc33 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -139,7 +139,7 @@ namespace OpenSim.Tests.Common | |||
139 | SceneCommunicationService scs = new SceneCommunicationService(); | 139 | SceneCommunicationService scs = new SceneCommunicationService(); |
140 | 140 | ||
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, false, configSource, null); |
143 | 143 | ||
144 | INonSharedRegionModule godsModule = new GodsModule(); | 144 | INonSharedRegionModule godsModule = new GodsModule(); |
145 | godsModule.Initialise(new IniConfigSource()); | 145 | godsModule.Initialise(new IniConfigSource()); |
@@ -359,28 +359,10 @@ namespace OpenSim.Tests.Common | |||
359 | List<IRegionModuleBase> newModules = new List<IRegionModuleBase>(); | 359 | List<IRegionModuleBase> newModules = new List<IRegionModuleBase>(); |
360 | foreach (object module in modules) | 360 | foreach (object module in modules) |
361 | { | 361 | { |
362 | // Console.WriteLine("MODULE RAW {0}", module); | 362 | IRegionModuleBase m = (IRegionModuleBase)module; |
363 | if (module is IRegionModule) | 363 | // Console.WriteLine("MODULE {0}", m.Name); |
364 | { | 364 | m.Initialise(config); |
365 | IRegionModule m = (IRegionModule)module; | 365 | newModules.Add(m); |
366 | |||
367 | foreach (Scene scene in scenes) | ||
368 | { | ||
369 | m.Initialise(scene, config); | ||
370 | scene.AddModule(m.Name, m); | ||
371 | } | ||
372 | |||
373 | m.PostInitialise(); | ||
374 | } | ||
375 | else if (module is IRegionModuleBase) | ||
376 | { | ||
377 | // for the new system, everything has to be initialised first, | ||
378 | // shared modules have to be post-initialised, then all get an AddRegion with the scene | ||
379 | IRegionModuleBase m = (IRegionModuleBase)module; | ||
380 | // Console.WriteLine("MODULE {0}", m.Name); | ||
381 | m.Initialise(config); | ||
382 | newModules.Add(m); | ||
383 | } | ||
384 | } | 366 | } |
385 | 367 | ||
386 | foreach (IRegionModuleBase module in newModules) | 368 | foreach (IRegionModuleBase module in newModules) |
@@ -709,4 +691,4 @@ namespace OpenSim.Tests.Common | |||
709 | return sog; | 691 | return sog; |
710 | } | 692 | } |
711 | } | 693 | } |
712 | } \ No newline at end of file | 694 | } |