7 files changed, 125 insertions, 57 deletions

diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
index 732c28f..e68764a 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         private Dictionary<UUID,JsonStore> m_JsonValueStore;
         private UUID m_sharedStore;
 
-#region IRegionModule Members
+#region Region Module interface
 
         // -----------------------------------------------------------------
         /// <summary>
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
index 6910d14..0c175ca 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         private IScriptModuleComms m_comms;
         private IJsonStoreModule m_store;
         
-#region IRegionModule Members
+#region Region Module interface
 
         // -----------------------------------------------------------------
         /// <summary>
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 03481d2..6fb28e2 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -43,13 +43,17 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
+using Mono.Addins;
 
 namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
 {
-    public class MRMModule : IRegionModule, IMRMModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MRMModule")]
+    public class MRMModule : INonSharedRegionModule, IMRMModule
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private Scene m_scene;
+        private bool m_Enabled;
+        private bool m_Hidden;
 
         private readonly Dictionary<UUID,MRMBase> m_scripts = new Dictionary<UUID, MRMBase>();
 
@@ -67,7 +71,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
             m_extensions[typeof (T)] = instance;
         }
 
-        public void Initialise(Scene scene, IConfigSource source)
+        #region INonSharedRegionModule
+
+        public void Initialise(IConfigSource source)
         {
             if (source.Configs["MRM"] != null)
             {
@@ -76,23 +82,60 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
                 if (source.Configs["MRM"].GetBoolean("Enabled", false))
                 {
                     m_log.Info("[MRM]: Enabling MRM Module");
-                    m_scene = scene;
+                    m_Enabled = true;
+                    m_Hidden = source.Configs["MRM"].GetBoolean("Hidden", false);
+                }
+            }
+        }
 
-                    // 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;
-                    }
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
 
-                    scene.EventManager.OnFrame += EventManager_OnFrame;
+            m_scene = scene;
 
-                    scene.RegisterModuleInterface<IMRMModule>(this);
-                }
+            // when hidden, we don't listen for client initiated script events
+            // only making the MRM engine available for region modules
+            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)
+        {
+        }
+
+        public void Close()
+        {
+            foreach (KeyValuePair<UUID, MRMBase> pair in m_scripts)
+            {
+                pair.Value.Stop();
+            }
+        }
+
+        public string Name
+        {
+            get { return "MiniRegionModule"; }
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        #endregion
+
         void EventManager_OnStopScript(uint localID, UUID itemID)
         {
             if (m_scripts.ContainsKey(itemID))
@@ -293,28 +336,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)
-            {
-                pair.Value.Stop();
-            }
-        }
-
-        public string Name
-        {
-            get { return "MiniRegionModule"; }
-        }
-
-        public bool IsSharedModule
-        {
-            get { return false; }
-        }
-
         /// <summary>
         /// Stolen from ScriptEngine Common
         /// </summary>
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
index aa23fee..5ed1514 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
@@ -821,8 +821,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
         {
             if (!CanEdit())
                 return;
-
-            GetSOP().SendSound(asset.ToString(), volume, true, 0, 0, false, false);
+            ISoundModule module = m_rootScene.RequestModuleInterface<ISoundModule>();
+            if (module != null)
+            {
+                module.SendSound(GetSOP().UUID, asset, volume, true, 0, 0, false, false);
+            }
         }
 
         #endregion
diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
index bad75f7..c550c44 100644
--- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs
@@ -32,6 +32,7 @@ using System.Net;
 using System.IO;
 using System.Text;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
@@ -42,6 +43,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "RegionReadyModule")]
     public class RegionReadyModule : IRegionReadyModule, INonSharedRegionModule
     {
         private static readonly ILog m_log = 
diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs
index 2187449..6120a81 100644
--- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs
@@ -32,6 +32,7 @@ using System.Reflection;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
+using Mono.Addins;
 
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
@@ -49,7 +50,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule
         public string uri;
     }
 
-    public class XmlRpcGridRouter : IRegionModule, IXmlRpcRouter
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XmlRpcGridRouter")]
+    public class XmlRpcGridRouter : INonSharedRegionModule, IXmlRpcRouter
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
@@ -59,9 +61,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule
         private bool m_Enabled = false;
         private string m_ServerURI = String.Empty;
 
-        public void Initialise(Scene scene, IConfigSource config)
+        #region INonSharedRegionModule
+
+        public void Initialise(IConfigSource config)
         {
-            IConfig startupConfig = config.Configs["Startup"];
+            IConfig startupConfig = config.Configs["XMLRPC"];
             if (startupConfig == null)
                 return;
 
@@ -74,16 +78,30 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule
                     m_log.Error("[XMLRPC GRID ROUTER] Module configured but no URI given. Disabling");
                     return;
                 }
-
-                scene.RegisterModuleInterface<IXmlRpcRouter>(this);
                 m_Enabled = true;
             }
         }
 
-        public void PostInitialise()
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            scene.RegisterModuleInterface<IXmlRpcRouter>(this);
+        }
+
+        public void RegionLoaded(Scene scene)
         {
         }
 
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            scene.UnregisterModuleInterface<IXmlRpcRouter>(this);
+        }
+
         public void Close()
         {
         }
@@ -93,11 +111,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule
             get { return "XmlRpcGridRouterModule"; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
         {
-            get { return false; }
+            get { return null; }
         }
 
+        #endregion
+
         public void RegisterNewReceiver(IScriptModule scriptEngine, UUID channel, UUID objectID, UUID itemID, string uri)
         {
             if (!m_Channels.ContainsKey(itemID))
diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
index 32659c8..4783f4c 100644
--- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
@@ -31,6 +31,7 @@ using System.Reflection;
 using log4net;
 using Nini.Config;
 using OpenMetaverse;
+using Mono.Addins;
 
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
@@ -39,27 +40,46 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule
 {
-    public class XmlRpcRouter : IRegionModule, IXmlRpcRouter
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XmlRpcRouter")]
+    public class XmlRpcRouter : INonSharedRegionModule, IXmlRpcRouter
     {
         //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
-        public void Initialise(Scene scene, IConfigSource config)
+
+        private bool m_Enabled;
+
+        #region INonSharedRegionModule
+
+        public void Initialise(IConfigSource config)
         {
-            IConfig startupConfig = config.Configs["Startup"];
+            IConfig startupConfig = config.Configs["XMLRPC"];
             if (startupConfig == null)
                 return;
 
             if (startupConfig.GetString("XmlRpcRouterModule",
                     "XmlRpcRouterModule") == "XmlRpcRouterModule")
-            {
-                scene.RegisterModuleInterface<IXmlRpcRouter>(this);
-            }
+                m_Enabled = true;
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            scene.RegisterModuleInterface<IXmlRpcRouter>(this);
         }
 
-        public void PostInitialise()
+        public void RegionLoaded(Scene scene)
         {
         }
 
+        public void RemoveRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            scene.UnregisterModuleInterface<IXmlRpcRouter>(this);
+        }
+
         public void Close()
         {
         }
@@ -69,11 +89,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule
             get { return "XmlRpcRouterModule"; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
         {
-            get { return false; }
+            get { return null; }
         }
 
+        #endregion
+
         public void RegisterNewReceiver(IScriptModule scriptEngine, UUID channel, UUID objectID, UUID itemID, string uri)
         {
             scriptEngine.PostScriptEvent(itemID, "xmlrpc_uri", new Object[] {uri});