aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-11-12 22:25:35 +0000
committerMelanie2012-11-12 22:25:35 +0000
commite41374dd014721a01b8850d1dcf5f486a50f3b44 (patch)
tree0d8489cc2f9db42c2a5723f2f3dfd83ad1eef448 /OpenSim
parentRemove any mention of IRegionModule from region names and comments to aid (diff)
downloadopensim-SC_OLD-e41374dd014721a01b8850d1dcf5f486a50f3b44.zip
opensim-SC_OLD-e41374dd014721a01b8850d1dcf5f486a50f3b44.tar.gz
opensim-SC_OLD-e41374dd014721a01b8850d1dcf5f486a50f3b44.tar.bz2
opensim-SC_OLD-e41374dd014721a01b8850d1dcf5f486a50f3b44.tar.xz
Remove IRegionModule support from the test setup helper
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Tests/Common/Helpers/SceneHelpers.cs28
1 files changed, 5 insertions, 23 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index db0a7fc..c424439 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -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}