1 files changed, 41 insertions, 23 deletions

diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 4521f8e..f24bcdc 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -38,6 +38,7 @@ using System.Security.Policy;
 using System.Text;
 using log4net;
 using Microsoft.CSharp;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -46,7 +47,8 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 {
-    public class MRMModule : IRegionModule, IMRMModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class MRMModule : INonSharedRegionModule, IMRMModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private Scene m_scene;
@@ -62,12 +64,14 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 
         private IConfig m_config;
 
+        private bool m_hidden = true;
+
         public void RegisterExtension<T>(T instance)
         {
             m_extensions[typeof (T)] = instance;
         }
 
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
         {
             if (source.Configs["MRM"] != null)
             {
@@ -76,19 +80,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                 if (source.Configs["MRM"].GetBoolean("Enabled", false))
                 {
                     m_log.Info("[MRM] Enabling MRM Module");
-                    m_scene = scene;
-                
+                    
                     // when hidden, we don't listen for client initiated script events
                     // only making the MRM engine available for region modules
-                    if (!source.Configs["MRM"].GetBoolean("Hidden", false))
-                    {
-                        scene.EventManager.OnRezScript += EventManager_OnRezScript;
-                        scene.EventManager.OnStopScript += EventManager_OnStopScript;
-                    }
-                    
-                    scene.EventManager.OnFrame += EventManager_OnFrame;
-
-                    scene.RegisterModuleInterface<IMRMModule>(this);
+                    m_hidden = source.Configs["MRM"].GetBoolean("Hidden", false);
                 }
                 else
                 {
@@ -101,6 +96,39 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             }
         }
 
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            m_scene = scene;
+            if (!m_hidden)
+            {
+                scene.EventManager.OnRezScript += EventManager_OnRezScript;
+                scene.EventManager.OnStopScript += EventManager_OnStopScript;
+            }
+            scene.EventManager.OnFrame += EventManager_OnFrame;
+
+            scene.RegisterModuleInterface<IMRMModule>(this);
+        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_hidden)
+            {
+                scene.EventManager.OnRezScript -= EventManager_OnRezScript;
+                scene.EventManager.OnStopScript -= EventManager_OnStopScript;
+            }
+            scene.EventManager.OnFrame -= EventManager_OnFrame;
+
+            scene.UnregisterModuleInterface<IMRMModule>(this);
+        }
+
         void EventManager_OnStopScript(uint localID, UUID itemID)
         {
             if (m_scripts.ContainsKey(itemID))
@@ -302,11 +330,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             mmb.InitMiniModule(world, host, itemID);
         }
 
-        public void PostInitialise()
-        {
-            
-        }
-
         public void Close()
         {
             foreach (KeyValuePair<UUID, MRMBase> pair in m_scripts)
@@ -320,11 +343,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             get { return "MiniRegionModule"; }
         }
 
-        public bool IsSharedModule
-        {
-            get { return false; }
-        }
-
         /// <summary>
         /// Stolen from ScriptEngine Common
         /// </summary>