2 files changed, 17 insertions, 10 deletions

diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index 010c250..3cd7489 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Grid.GridServer
 
             AddHttpHandlers();
 
-            LoadGridPlugins();
+            LoadPlugins();
 
             m_httpServer.Start();
 
@@ -116,16 +116,12 @@ namespace OpenSim.Grid.GridServer
             m_httpServer.AddStreamHandler(new RestStreamHandler("POST", "/regions/", m_gridManager.RestSetRegionMethod));
         }
 
-        protected void grid_plugin_initialiser_ (IPlugin plugin)
+        protected void LoadPlugins()
         {
-            IGridPlugin p = plugin as IGridPlugin;
-            p.Initialise (this);
-        }
+            PluginLoader<IGridPlugin> loader = 
+                new PluginLoader<IGridPlugin> (new GridPluginInitialiser (this));
 
-        protected void LoadGridPlugins()
-        {
-            PluginLoader<IGridPlugin> loader = new PluginLoader<IGridPlugin> (".");
-            loader.Load ("/OpenSim/GridServer", grid_plugin_initialiser_);
+            loader.Load ("/OpenSim/GridServer", ".");
             m_plugins = loader.Plugins;
         }
 
@@ -181,7 +177,7 @@ namespace OpenSim.Grid.GridServer
 
         public override void Shutdown()
         {
-            foreach (IGridPlugin plugin in m_plugins) plugin.Close();
+            foreach (IGridPlugin plugin in m_plugins) plugin.Dispose();
 
             base.Shutdown();
         }
diff --git a/OpenSim/Grid/GridServer/IGridPlugin.cs b/OpenSim/Grid/GridServer/IGridPlugin.cs
index d51deb3..6593962 100644
--- a/OpenSim/Grid/GridServer/IGridPlugin.cs
+++ b/OpenSim/Grid/GridServer/IGridPlugin.cs
@@ -39,4 +39,15 @@ namespace OpenSim.Grid.GridServer
         void Initialise(GridServerBase gridServer);
         void Close();
     }
+    
+    public class GridPluginInitialiser : PluginInitialiserBase
+    {
+        private GridServerBase server;
+        public GridPluginInitialiser (GridServerBase s) { server = s; }
+        public override void Initialise (IPlugin plugin)
+        {
+            IGridPlugin p = plugin as IGridPlugin;
+            p.Initialise (server);
+        }
+    }
 }