From 23ec21e44a2d7227ca56c31622e9b9b754e52879 Mon Sep 17 00:00:00 2001
From: Charles Krinke
Date: Fri, 4 Jul 2008 03:11:53 +0000
Subject: Mantis#1647. Thank you very much, Sempuki for a patch that: Updates
 the previous module loader work.

---
 OpenSim/Region/Application/IApplicationPlugin.cs | 11 +++++++++++
 OpenSim/Region/Application/OpenSimBase.cs        | 13 +++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/Application')

diff --git a/OpenSim/Region/Application/IApplicationPlugin.cs b/OpenSim/Region/Application/IApplicationPlugin.cs
index e1187ae..f122925 100644
--- a/OpenSim/Region/Application/IApplicationPlugin.cs
+++ b/OpenSim/Region/Application/IApplicationPlugin.cs
@@ -37,4 +37,15 @@ namespace OpenSim
     {
         void Initialise(OpenSimBase openSim);
     }
+    
+    public class ApplicationPluginInitialiser : PluginInitialiserBase
+    {
+        private OpenSimBase server;
+        public ApplicationPluginInitialiser (OpenSimBase s) { server = s; }
+        public override void Initialise (IPlugin plugin)
+        {
+            IApplicationPlugin p = plugin as IApplicationPlugin;
+            p.Initialise (server);
+        }
+    }
 }
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 55d19c1..2c2ec09 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -332,16 +332,12 @@ namespace OpenSim
             m_networkServersInfo.loadFromConfiguration(m_config.Source);
         }
 
-        protected void plugin_initialiser_ (IPlugin plugin)
-        {
-            IApplicationPlugin p = plugin as IApplicationPlugin;
-            p.Initialise (this);
-        }
-
         protected void LoadPlugins()
         {
-            PluginLoader<IApplicationPlugin> loader = new PluginLoader<IApplicationPlugin> (".");
-            loader.Load ("/OpenSim/Startup", plugin_initialiser_);
+            PluginLoader<IApplicationPlugin> loader = 
+                new PluginLoader<IApplicationPlugin> (new ApplicationPluginInitialiser (this));
+
+            loader.Load ("/OpenSim/Startup", ".");
             m_plugins = loader.Plugins;
         }
 
@@ -733,3 +729,4 @@ namespace OpenSim
 
 
 
+
-- 
cgit v1.1