Remove the old style module loader and all references to it

1 files changed, 1 insertions, 25 deletions

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 7b591a8..a3d6820 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -127,14 +127,6 @@ namespace OpenSim
             get { return m_httpServerPort; }
         }
 
-        public ModuleLoader ModuleLoader
-        {
-            get { return m_moduleLoader; }
-            set { m_moduleLoader = value; }
-        }
-
-        protected ModuleLoader m_moduleLoader;
-
         protected IRegistryCore m_applicationRegistry = new RegistryCore();
 
         public IRegistryCore ApplicationRegistry
@@ -223,9 +215,6 @@ namespace OpenSim
 
             base.StartupSpecific();
 
-            // Create a ModuleLoader instance
-            m_moduleLoader = new ModuleLoader(m_config.Source);
-
             LoadPlugins();
             foreach (IApplicationPlugin plugin in m_plugins)
             {
@@ -370,12 +359,6 @@ namespace OpenSim
 
             m_log.Info("[MODULES]: Loading Region's modules (old style)");
 
-            List<IRegionModule> modules = m_moduleLoader.PickupModules(scene, ".");
-
-            // This needs to be ahead of the script engine load, so the
-            // script module can pick up events exposed by a module
-            m_moduleLoader.InitialiseSharedModules(scene);
-
             // Use this in the future, the line above will be deprecated soon
             m_log.Info("[REGIONMODULES]: Loading Region's modules (new style)");
             IRegionModulesController controller;
@@ -426,13 +409,6 @@ namespace OpenSim
                 clientServer.Start();
             }
 
-            if (do_post_init)
-            {
-                foreach (IRegionModule module in modules)
-                {
-                    module.PostInitialise();
-                }
-            }
             scene.EventManager.OnShutdown += delegate() { ShutdownRegion(scene); };
 
             mscene = scene;
@@ -722,7 +698,7 @@ namespace OpenSim
 
             return new Scene(
                 regionInfo, circuitManager, sceneGridService,
-                simDataService, estateDataService, m_moduleLoader, false,
+                simDataService, estateDataService, false,
                 m_config.Source, m_version);
         }