From a87a247f0548d39a8c39b1d28123d7da8db44598 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 29 Jan 2010 07:20:13 +0000
Subject: Revert "Updates all IRegionModules to the new style region modules."

This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.
---
 OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs | 31 +++++++++++++++--------
 1 file changed, 21 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs')

diff --git a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
index 4534024..0f2ba32 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
@@ -32,7 +32,6 @@ using System.Net;
 using System.Reflection;
 using System.Text;
 using log4net;
-using Mono.Addins;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenMetaverse;
@@ -43,8 +42,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.InterGrid
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class OGSRadmin : ISharedRegionModule 
+    public class OGSRadmin : IRegionModule 
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private readonly List<Scene> m_scenes = new List<Scene>();
@@ -58,6 +56,7 @@ namespace OpenSim.Region.CoreModules.InterGrid
             get { return "OGS Supporting RAdmin"; }
         }
 
+
         public void Initialise(IConfigSource source)
         {
             m_settings = source;
@@ -68,11 +67,6 @@ namespace OpenSim.Region.CoreModules.InterGrid
 
         }
 
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
-
         public void AddRegion(Scene scene)
         {
             lock (m_scenes)
@@ -83,11 +77,15 @@ namespace OpenSim.Region.CoreModules.InterGrid
         {
             lock (m_scenes)
                 m_scenes.Remove(scene);
-            MainServer.Instance.RemoveXmlRPCHandler("grid_message");
         }
 
         public void RegionLoaded(Scene scene)
         {
+            
+        }
+
+        public void PostInitialise()
+        {
             if (m_settings.Configs["Startup"].GetBoolean("gridmode", false))
             {
                 m_com = m_scenes[0].CommsManager;
@@ -95,8 +93,21 @@ namespace OpenSim.Region.CoreModules.InterGrid
             }
         }
 
-        public void PostInitialise()
+        #endregion
+
+        #region IRegionModule
+
+        public void Initialise(Scene scene, IConfigSource source)
+        {
+            m_settings = source;
+
+            lock (m_scenes)
+                m_scenes.Add(scene);
+        }
+
+        public bool IsSharedModule
         {
+            get { return true; }
         }
 
         #endregion
-- 
cgit v1.1