From 26a94610fc88846aeab8e6e2ac09ebcf85a89122 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 10 Nov 2012 10:21:37 -0800
Subject: Fix Unit tests -- the module contract was not being honored in the
 set up of scenes.

---
 OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Tests')

diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index fc49169..6d67b67 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -385,18 +385,18 @@ namespace OpenSim.Tests.Common
 
             foreach (IRegionModuleBase module in newModules)
             {
-                if (module is ISharedRegionModule) ((ISharedRegionModule)module).PostInitialise();
-            }
-
-            foreach (IRegionModuleBase module in newModules)
-            {
                 foreach (Scene scene in scenes)
                 {
                     module.AddRegion(scene);
                     scene.AddRegionModule(module.Name, module);
                 }
             }
-            
+
+            foreach (IRegionModuleBase module in newModules)
+            {
+                if (module is ISharedRegionModule) ((ISharedRegionModule)module).PostInitialise();
+            }
+
             // RegionLoaded is fired after all modules have been appropriately added to all scenes
             foreach (IRegionModuleBase module in newModules)
                 foreach (Scene scene in scenes)
-- 
cgit v1.1


From 562c585bc6fb1e659ab395089cf497a390f03b33 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 10 Nov 2012 17:34:42 -0800
Subject: One more module converted: GodsModule.

---
 OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Tests')

diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index 6d67b67..f9c1ac2 100644
--- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -141,9 +141,9 @@ namespace OpenSim.Tests.Common
             TestScene testScene = new TestScene(
                 regInfo, m_acm, scs, m_simDataService, m_estateDataService, null, false, configSource, null);
 
-            IRegionModule godsModule = new GodsModule();
-            godsModule.Initialise(testScene, new IniConfigSource());
-            testScene.AddModule(godsModule.Name, godsModule);
+            INonSharedRegionModule godsModule = new GodsModule();
+            godsModule.Initialise(new IniConfigSource());
+            godsModule.AddRegion(testScene);
 
             // Add scene to services
             m_assetService.AddRegion(testScene);
-- 
cgit v1.1