Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
	OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
	OpenSim/Region/Framework/ModuleLoader.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs

2 files changed, 9 insertions, 27 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
             SceneCommunicationService scs = new SceneCommunicationService();
 
             TestScene testScene = new TestScene(
-                regInfo, m_acm, scs, m_simDataService, m_estateDataService, null, false, configSource, null);
+                regInfo, m_acm, scs, m_simDataService, m_estateDataService, false, configSource, null);
 
             INonSharedRegionModule godsModule = new GodsModule();
             godsModule.Initialise(new IniConfigSource());
@@ -359,28 +359,10 @@ namespace OpenSim.Tests.Common
             List<IRegionModuleBase> newModules = new List<IRegionModuleBase>();
             foreach (object module in modules)
             {
-//                Console.WriteLine("MODULE RAW {0}", module);
-                if (module is IRegionModule)
-                {
-                    IRegionModule m = (IRegionModule)module;
-
-                    foreach (Scene scene in scenes)
-                    {
-                        m.Initialise(scene, config);
-                        scene.AddModule(m.Name, m);
-                    }
-
-                    m.PostInitialise();
-                }
-                else if (module is IRegionModuleBase)
-                {
-                    // for the new system, everything has to be initialised first,
-                    // shared modules have to be post-initialised, then all get an AddRegion with the scene
-                    IRegionModuleBase m = (IRegionModuleBase)module;
-//                    Console.WriteLine("MODULE {0}", m.Name);
-                    m.Initialise(config);
-                    newModules.Add(m);
-                }
+                IRegionModuleBase m = (IRegionModuleBase)module;
+//                Console.WriteLine("MODULE {0}", m.Name);
+                m.Initialise(config);
+                newModules.Add(m);
             }
 
             foreach (IRegionModuleBase module in newModules)
@@ -709,4 +691,4 @@ namespace OpenSim.Tests.Common
             return sog;
         }        
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index eea68c3..d4b5648 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -41,9 +41,9 @@ namespace OpenSim.Tests.Common.Mock
         public TestScene(
             RegionInfo regInfo, AgentCircuitManager authen,
             SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService,
-            ModuleLoader moduleLoader, bool dumpAssetsToFile,
+            bool dumpAssetsToFile,
             IConfigSource config, string simulatorVersion)
-            : base(regInfo, authen, sceneGridService, simDataService, estateDataService, moduleLoader,
+            : base(regInfo, authen, sceneGridService, simDataService, estateDataService,
                    dumpAssetsToFile, config, simulatorVersion)
         {
         }
@@ -73,4 +73,4 @@ namespace OpenSim.Tests.Common.Mock
             get { return m_asyncSceneObjectDeleter; }
         }
     }
-}
\ No newline at end of file
+}