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.
---
 .../Region/CoreModules/Avatar/Lure/LureModule.cs   | 61 ++++++----------------
 1 file changed, 15 insertions(+), 46 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs')

diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index 973d27f..261bd6c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -29,7 +29,6 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
-using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -38,72 +37,36 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Avatar.Lure
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class LureModule : ISharedRegionModule
+    public class LureModule : IRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private readonly List<Scene> m_scenes = new List<Scene>();
 
-        private bool m_enabled = true;
-
         private IMessageTransferModule m_TransferModule = null;
 
-        public void Initialise(IConfigSource config)
+        public void Initialise(Scene scene, IConfigSource config)
         {
             if (config.Configs["Messaging"] != null)
             {
                 if (config.Configs["Messaging"].GetString(
                         "LureModule", "LureModule") !=
                         "LureModule")
-                    m_enabled = false;
+                    return;
             }
-        }
-
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
 
-        public void AddRegion(Scene scene)
-        {
-            if (m_enabled)
+            lock (m_scenes)
             {
-                lock (m_scenes)
+                if (!m_scenes.Contains(scene))
                 {
-                    if (!m_scenes.Contains(scene))
-                    {
-                        m_scenes.Add(scene);
-                        scene.EventManager.OnNewClient += OnNewClient;
-                        scene.EventManager.OnIncomingInstantMessage +=
-                                OnGridInstantMessage;
-                    }
+                    m_scenes.Add(scene);
+                    scene.EventManager.OnNewClient += OnNewClient;
+                    scene.EventManager.OnIncomingInstantMessage +=
+                            OnGridInstantMessage;
                 }
             }
         }
 
-        public void RegionLoaded(Scene scene)
-        {
-            if (m_enabled)
-            {
-                m_TransferModule =
-                    m_scenes[0].RequestModuleInterface<IMessageTransferModule>();
-
-                if (m_TransferModule == null)
-                    m_log.Error("[INSTANT MESSAGE]: No message transfer module, " +
-                    "lures will not work!");
-            }
-        }
-
-        public void RemoveRegion(Scene scene)
-        {
-            if (m_scenes.Contains(scene))
-                m_scenes.Remove(scene);
-            scene.EventManager.OnNewClient -= OnNewClient;
-            scene.EventManager.OnIncomingInstantMessage -=
-                    OnGridInstantMessage;
-        }
-
         void OnNewClient(IClientAPI client)
         {
             client.OnInstantMessage += OnInstantMessage;
@@ -113,6 +76,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
 
         public void PostInitialise()
         {
+            m_TransferModule =
+                m_scenes[0].RequestModuleInterface<IMessageTransferModule>();
+
+            if (m_TransferModule == null)
+                m_log.Error("[INSTANT MESSAGE]: No message transfer module, "+
+                "lures will not work!");
         }
 
         public void Close()
-- 
cgit v1.1