From 6759ed1013b78371b28c2d802c5d793e7b32c723 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 11 Nov 2012 14:46:22 -0800
Subject: One more module converted: LoadImageURLModule. Also removed it from
 its hard-coded instantiation (I think I understood what the problem was, and
 that I've done it right).

---
 OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs')

diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 0065702..e7b12be 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -101,8 +101,8 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
             m_log.Info("[LOAD REGIONS PLUGIN]: Loading specific shared modules...");
             m_log.Info("[LOAD REGIONS PLUGIN]: DynamicTextureModule...");
             m_openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule());
-            m_log.Info("[LOAD REGIONS PLUGIN]: LoadImageURLModule...");
-            m_openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule());
+            //m_log.Info("[LOAD REGIONS PLUGIN]: LoadImageURLModule...");
+            //m_openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule());
             m_log.Info("[LOAD REGIONS PLUGIN]: XMLRPCModule...");
             m_openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule());
 //            m_log.Info("[LOADREGIONSPLUGIN]: AssetTransactionModule...");
-- 
cgit v1.1


From 9f45198516ef7c7bfc92d638ae142d821852a4d9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 11 Nov 2012 14:54:40 -0800
Subject: One more module: DynamicTextureModule. Removed it from the special
 load in the beginning.

---
 OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs')

diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index e7b12be..920a6bc 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -99,8 +99,8 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
             RegionInfo[] regionsToLoad = regionLoader.LoadRegions();
 
             m_log.Info("[LOAD REGIONS PLUGIN]: Loading specific shared modules...");
-            m_log.Info("[LOAD REGIONS PLUGIN]: DynamicTextureModule...");
-            m_openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule());
+            //m_log.Info("[LOAD REGIONS PLUGIN]: DynamicTextureModule...");
+            //m_openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule());
             //m_log.Info("[LOAD REGIONS PLUGIN]: LoadImageURLModule...");
             //m_openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule());
             m_log.Info("[LOAD REGIONS PLUGIN]: XMLRPCModule...");
-- 
cgit v1.1


From 571f6a030002e754e9c711218396fa649ac28de6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 11 Nov 2012 15:29:25 -0800
Subject: One more module converted: XMLRPCModule. Removed it from the special
 loading at start.

---
 OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs')

diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 920a6bc..a8a3237 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -103,8 +103,8 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
             //m_openSim.ModuleLoader.LoadDefaultSharedModule(new DynamicTextureModule());
             //m_log.Info("[LOAD REGIONS PLUGIN]: LoadImageURLModule...");
             //m_openSim.ModuleLoader.LoadDefaultSharedModule(new LoadImageURLModule());
-            m_log.Info("[LOAD REGIONS PLUGIN]: XMLRPCModule...");
-            m_openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule());
+            //m_log.Info("[LOAD REGIONS PLUGIN]: XMLRPCModule...");
+            //m_openSim.ModuleLoader.LoadDefaultSharedModule(new XMLRPCModule());
 //            m_log.Info("[LOADREGIONSPLUGIN]: AssetTransactionModule...");
 //            m_openSim.ModuleLoader.LoadDefaultSharedModule(new AssetTransactionModule());
             m_log.Info("[LOAD REGIONS PLUGIN]: Done.");
-- 
cgit v1.1


From 8c130bcaf5a60fa042d8df38ba1d1e1cb328d768 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 12 Nov 2012 22:50:28 +0000
Subject: Remove the old style module loader and all references to it

---
 OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs')

diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index a8a3237..fcb6991 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -136,9 +136,6 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
                     }
                 }
             }
-
-            m_openSim.ModuleLoader.PostInitialise();
-            m_openSim.ModuleLoader.ClearCache();
         }
 
         public void Dispose()
-- 
cgit v1.1