1 files changed, 12 insertions, 24 deletions

diff --git a/OpenSim/Client/MXP/MXPModule.cs b/OpenSim/Client/MXP/MXPModule.cs
index 47417ab..0b442cc 100644
--- a/OpenSim/Client/MXP/MXPModule.cs
+++ b/OpenSim/Client/MXP/MXPModule.cs
@@ -31,7 +31,6 @@ using System.Reflection;
 using System.Text;
 using System.Timers;
 using log4net;
-using Mono.Addins;
 using MXP;
 using Nini.Config;
 using OpenMetaverse;
@@ -45,8 +44,7 @@ namespace OpenSim.Client.MXP
     /**
      * MXP Client Module which adds MXP support to client / region communication.
      */
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class MXPModule : ISharedRegionModule
+    public class MXPModule : IRegionModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -59,23 +57,15 @@ namespace OpenSim.Client.MXP
         private readonly Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>();
         private bool m_shutdown;
 
-        public void Initialise(IConfigSource source)
-        {
-            m_config = source;
-        }
-
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
-
-        public void AddRegion(Scene scene)
+        public void Initialise(Scene scene, IConfigSource source)
         {
             if (!m_scenes.ContainsKey(scene.RegionInfo.RegionID))
                 m_scenes.Add(scene.RegionInfo.RegionID, scene);
+
+            m_config = source;
         }
 
-        public void RegionLoaded(Scene scene)
+        public void PostInitialise()
         {
             if (m_config.Configs["MXP"] != null)
             {
@@ -86,7 +76,7 @@ namespace OpenSim.Client.MXP
 
                 m_port = con.GetInt("Port", m_port);
 
-                m_server = new MXPPacketServer(m_port, m_scenes, m_config.Configs["StandAlone"].GetBoolean("accounts_authenticate", true));
+                m_server = new MXPPacketServer(m_port, m_scenes,m_config.Configs["StandAlone"].GetBoolean("accounts_authenticate",true));
 
                 m_ticker = new Timer(100);
                 m_ticker.AutoReset = false;
@@ -99,14 +89,6 @@ namespace OpenSim.Client.MXP
             }
         }
 
-        public void RemoveRegion(Scene scene)
-        {
-        }
-
-        public void PostInitialise()
-        {
-        }
-
         void ticker_Elapsed(object sender, ElapsedEventArgs e)
         {
             try
@@ -139,5 +121,11 @@ namespace OpenSim.Client.MXP
         {
             get { return "MXP ClientStack Module"; }
         }
+
+        public bool IsSharedModule
+        {
+            get { return true; }
+        }
+
     }
 }