From ec3c31e61e5e540f822891110df9bc978655bbaf Mon Sep 17 00:00:00 2001
From: Revolution
Date: Fri, 22 Jan 2010 18:09:33 -0600
Subject: Updates all IRegionModules to the new style region modules.

Signed-off-by: Melanie <melanie@t-data.com>
---
 .../Avatar/InstantMessage/PresenceModule.cs        | 61 +++++++++++++++-------
 1 file changed, 41 insertions(+), 20 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs')

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
index f5ab454..f5498f4 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
@@ -24,11 +24,14 @@
  * (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;
@@ -39,7 +42,8 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
-    public class PresenceModule : IRegionModule, IPresenceModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class PresenceModule : ISharedRegionModule, IPresenceModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -59,7 +63,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
         public event PresenceChange OnPresenceChange;
         public event BulkPresenceData OnBulkPresenceData;
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
         {
             lock (m_Scenes)
             {
@@ -78,28 +82,38 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                         m_Gridmode = cnf.GetBoolean("gridmode", false);
 
                     m_Enabled = true;
-
-                    m_initialScene = scene;
                 }
+            }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
 
+        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 PostInitialise()
+        public void RegionLoaded(Scene scene)
         {
         }
 
-        public void Close()
+        public void RemoveRegion(Scene scene)
         {
             if (!m_Gridmode || !m_Enabled)
                 return;
@@ -116,21 +130,28 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 }
             }
 
-            lock (m_Scenes)
-            {
-                foreach (Scene scene in m_Scenes)
-                    NotifyMessageServerOfShutdown(scene);
-            }
+            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 string Name
+        public void PostInitialise()
         {
-            get { return "PresenceModule"; }
         }
 
-        public bool IsSharedModule
+        public void Close()
         {
-            get { return true; }
+        }
+
+        public string Name
+        {
+            get { return "PresenceModule"; }
         }
 
         public void RequestBulkPresenceData(UUID[] users)
-- 
cgit v1.1