Revert "Updates all IRegionModules to the new style region modules."

This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.

5 files changed, 83 insertions, 174 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index e1bde4b..9a68749 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -24,12 +24,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
-using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -39,8 +36,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class InstantMessageModule : ISharedRegionModule
+    public class InstantMessageModule : IRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -51,11 +47,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         
         private readonly List<Scene> m_scenes = new List<Scene>();
 
-        #region ISharedRegionModule Members
+        #region IRegionModule Members
 
         private IMessageTransferModule m_TransferModule = null;
 
-        public void Initialise(IConfigSource config)
+        public void Initialise(Scene scene, IConfigSource config)
         {
             if (config.Configs["Messaging"] != null)
             {
@@ -66,15 +62,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             }
             
             m_enabled = true;
-        }
-
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
 
-        public void AddRegion(Scene scene)
-        {
             lock (m_scenes)
             {
                 if (!m_scenes.Contains(scene))
@@ -86,27 +74,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             }
         }
 
-        public void RegionLoaded(Scene scene)
-        {
-            if (!m_enabled)
-                return;
-
-            m_TransferModule =
-                m_scenes[0].RequestModuleInterface<IMessageTransferModule>();
-
-            if (m_TransferModule == null)
-                m_log.Error("[INSTANT MESSAGE]: No message transfer module, " +
-                "IM will not work!");
-        }
-
-        public void RemoveRegion(Scene scene)
-        {
-            if (m_scenes.Contains(scene))
-                m_scenes.Remove(scene);
-            scene.EventManager.OnClientConnect -= OnClientConnect;
-            scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
-        }
-
         void OnClientConnect(IClientCore client)
         {
             IClientIM clientIM;
@@ -118,6 +85,15 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
         public void PostInitialise()
         {
+            if (!m_enabled)
+                return;
+            
+            m_TransferModule =
+                m_scenes[0].RequestModuleInterface<IMessageTransferModule>();
+
+            if (m_TransferModule == null)
+                m_log.Error("[INSTANT MESSAGE]: No message transfer module, "+
+                "IM will not work!");
         }
 
         public void Close()
@@ -129,6 +105,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             get { return "InstantMessageModule"; }
         }
 
+        public bool IsSharedModule
+        {
+            get { return true; }
+        }
+
         #endregion
 
         public void OnInstantMessage(IClientAPI client, GridInstantMessage im)
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 16bdfdd..e5159b3 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -30,7 +30,6 @@ using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
 using log4net;
-using Mono.Addins;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenMetaverse;
@@ -41,8 +40,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class MessageTransferModule : ISharedRegionModule, IMessageTransferModule
+    public class MessageTransferModule : IRegionModule, IMessageTransferModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -52,9 +50,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         protected Dictionary<UUID, ulong> m_UserRegionMap = new Dictionary<UUID, ulong>();
 
         public event UndeliveredMessage OnUndeliveredMessage;
-        private bool m_enabled = true;
 
-        public virtual void Initialise(IConfigSource config)
+        public virtual void Initialise(Scene scene, IConfigSource config)
         {
             IConfig cnf = config.Configs["Messaging"];
             if (cnf != null && cnf.GetString(
@@ -62,49 +59,27 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     "MessageTransferModule")
             {
                 m_log.Debug("[MESSAGE TRANSFER]: Disabled by configuration");
-                m_enabled = false;
+                return;
             }
 
             cnf = config.Configs["Startup"];
             if (cnf != null)
                 m_Gridmode = cnf.GetBoolean("gridmode", false);
-        }
 
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
+            // m_Enabled = true;
 
-        public void AddRegion(Scene scene)
-        {
-            if (m_enabled)
+            lock (m_Scenes)
             {
-                lock (m_Scenes)
+                if (m_Scenes.Count == 0)
                 {
-                    if (m_Scenes.Count == 0)
-                    {
-                        MainServer.Instance.AddXmlRPCHandler(
-                            "grid_instant_message", processXMLRPCGridInstantMessage);
-                    }
-
-                    m_log.Debug("[MESSAGE TRANSFER]: Message transfer module active");
-                    scene.RegisterModuleInterface<IMessageTransferModule>(this);
-                    m_Scenes.Add(scene);
+                    MainServer.Instance.AddXmlRPCHandler(
+                        "grid_instant_message", processXMLRPCGridInstantMessage);
                 }
-            }
-        }
 
-        public void RegionLoaded(Scene scene)
-        {
-        }
-
-        public void RemoveRegion(Scene scene)
-        {
-            if (m_Scenes.Contains(scene))
-                m_Scenes.Remove(scene);
-            MainServer.Instance.RemoveXmlRPCHandler(
-                            "grid_instant_message");
-            scene.UnregisterModuleInterface<IMessageTransferModule>(this);
+                m_log.Debug("[MESSAGE TRANSFER]: Message transfer module active");
+                scene.RegisterModuleInterface<IMessageTransferModule>(this);
+                m_Scenes.Add(scene);
+            }
         }
 
         public virtual void PostInitialise()
@@ -120,6 +95,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             get { return "MessageTransferModule"; }
         }
 
+        public virtual bool IsSharedModule
+        {
+            get { return true; }
+        }
+
         public virtual void SendInstantMessage(GridInstantMessage im, MessageResultNotification result)
         {
             UUID toAgentID = new UUID(im.toAgentID);
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
index 3570495..2d4a635 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
@@ -28,7 +28,6 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
-using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -40,8 +39,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Avatar.MuteList
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class MuteListModule : ISharedRegionModule
+    public class MuteListModule : IRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -49,7 +47,7 @@ namespace OpenSim.Region.CoreModules.Avatar.MuteList
         private List<Scene> m_SceneList = new List<Scene>();
         private string m_RestURL = String.Empty;
 
-        public void Initialise(IConfigSource config)
+        public void Initialise(Scene scene, IConfigSource config)
         {
             if (!enabled)
                 return;
@@ -68,24 +66,19 @@ namespace OpenSim.Region.CoreModules.Avatar.MuteList
                 enabled = false;
                 return;
             }
-            m_RestURL = cnf.GetString("MuteListURL", "");
-            if (m_RestURL == "")
-            {
-                m_log.Error("[MUTE LIST] Module was enabled, but no URL is given, disabling");
-                enabled = false;
-                return;
-            }
-        }
 
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
-
-        public void AddRegion(Scene scene)
-        {
             lock (m_SceneList)
             {
+                if (m_SceneList.Count == 0)
+                {
+                    m_RestURL = cnf.GetString("MuteListURL", "");
+                    if (m_RestURL == "")
+                    {
+                        m_log.Error("[MUTE LIST] Module was enabled, but no URL is given, disabling");
+                        enabled = false;
+                        return;
+                    }
+                }
                 if (!m_SceneList.Contains(scene))
                     m_SceneList.Add(scene);
 
@@ -93,18 +86,6 @@ namespace OpenSim.Region.CoreModules.Avatar.MuteList
             }
         }
 
-        public void RegionLoaded(Scene scene)
-        {
-        }
-
-        public void RemoveRegion(Scene scene)
-        {
-            if (m_SceneList.Contains(scene))
-                m_SceneList.Remove(scene);
-
-            scene.EventManager.OnNewClient -= OnNewClient;
-        }
-
         public void PostInitialise()
         {
             if (!enabled)
@@ -121,6 +102,11 @@ namespace OpenSim.Region.CoreModules.Avatar.MuteList
             get { return "MuteListModule"; }
         }
 
+        public bool IsSharedModule
+        {
+            get { return true; }
+        }
+        
         public void Close()
         {
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index 6c4d0bf..ff38b6f 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -28,7 +28,6 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
-using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -41,8 +40,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class OfflineMessageModule : ISharedRegionModule
+    public class OfflineMessageModule : IRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -51,7 +49,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         private string m_RestURL = String.Empty;
         private bool m_ForwardOfflineGroupMessages = true;
 
-        public void Initialise(IConfigSource config)
+        public void Initialise(Scene scene, IConfigSource config)
         {
             if (!enabled)
                 return;
@@ -85,23 +83,14 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                         return;
                     }
                 }
-            }
-        }
-
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
+                if (!m_SceneList.Contains(scene))
+                    m_SceneList.Add(scene);
 
-        public void AddRegion(Scene scene)
-        {
-            if (!m_SceneList.Contains(scene))
-                m_SceneList.Add(scene);
-
-            scene.EventManager.OnNewClient += OnNewClient;
+                scene.EventManager.OnNewClient += OnNewClient;
+            }
         }
 
-        public void RegionLoaded(Scene scene)
+        public void PostInitialise()
         {
             if (!enabled)
                 return;
@@ -131,22 +120,16 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             m_log.Debug("[OFFLINE MESSAGING] Offline messages enabled");
         }
 
-        public void RemoveRegion(Scene scene)
-        {
-            if (m_SceneList.Contains(scene))
-                m_SceneList.Remove(scene);
-            scene.EventManager.OnNewClient -= OnNewClient;
-        }
-
-        public void PostInitialise()
-        {
-        }
-
         public string Name
         {
             get { return "OfflineMessageModule"; }
         }
 
+        public bool IsSharedModule
+        {
+            get { return true; }
+        }
+        
         public void Close()
         {
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
index f5498f4..f5ab454 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
@@ -24,14 +24,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
 using log4net;
-using Mono.Addins;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenMetaverse;
@@ -42,8 +39,7 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class PresenceModule : ISharedRegionModule, IPresenceModule
+    public class PresenceModule : IRegionModule, IPresenceModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -63,7 +59,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         public event PresenceChange OnPresenceChange;
         public event BulkPresenceData OnBulkPresenceData;
 
-        public void Initialise(IConfigSource config)
+        public void Initialise(Scene scene, IConfigSource config)
         {
             lock (m_Scenes)
             {
@@ -82,38 +78,28 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                         m_Gridmode = cnf.GetBoolean("gridmode", false);
 
                     m_Enabled = true;
-                }
-            }
-        }
 
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
+                    m_initialScene = scene;
+                }
 
-        public void AddRegion(Scene scene)
-        {
-            if (m_Enabled)
-            {
-                m_initialScene = scene;
                 if (m_Gridmode)
                     NotifyMessageServerOfStartup(scene);
 
                 m_Scenes.Add(scene);
+            }
 
-                scene.RegisterModuleInterface<IPresenceModule>(this);
+            scene.RegisterModuleInterface<IPresenceModule>(this);
 
-                scene.EventManager.OnNewClient += OnNewClient;
-                scene.EventManager.OnSetRootAgentScene += OnSetRootAgentScene;
-                scene.EventManager.OnMakeChildAgent += OnMakeChildAgent;
-            }
+            scene.EventManager.OnNewClient += OnNewClient;
+            scene.EventManager.OnSetRootAgentScene += OnSetRootAgentScene;
+            scene.EventManager.OnMakeChildAgent += OnMakeChildAgent;
         }
 
-        public void RegionLoaded(Scene scene)
+        public void PostInitialise()
         {
         }
 
-        public void RemoveRegion(Scene scene)
+        public void Close()
         {
             if (!m_Gridmode || !m_Enabled)
                 return;
@@ -130,28 +116,21 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 }
             }
 
-            NotifyMessageServerOfShutdown(scene);
-            if(m_Scenes.Contains(scene))
-                m_Scenes.Remove(scene);
-
-            scene.UnregisterModuleInterface<IPresenceModule>(this);
-
-            scene.EventManager.OnNewClient -= OnNewClient;
-            scene.EventManager.OnSetRootAgentScene -= OnSetRootAgentScene;
-            scene.EventManager.OnMakeChildAgent -= OnMakeChildAgent;
-        }
-
-        public void PostInitialise()
-        {
+            lock (m_Scenes)
+            {
+                foreach (Scene scene in m_Scenes)
+                    NotifyMessageServerOfShutdown(scene);
+            }
         }
 
-        public void Close()
+        public string Name
         {
+            get { return "PresenceModule"; }
         }
 
-        public string Name
+        public bool IsSharedModule
         {
-            get { return "PresenceModule"; }
+            get { return true; }
         }
 
         public void RequestBulkPresenceData(UUID[] users)