Merge branch 'master' into careminster

2 files changed, 39 insertions, 19 deletions

diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs
index d18ac0a..f2a0e53 100644
--- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcGridRouterModule.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Reflection;
 
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 
@@ -49,7 +50,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule
         public string uri;
     }
 
-    public class XmlRpcGridRouter : IRegionModule, IXmlRpcRouter
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class XmlRpcGridRouter : INonSharedRegionModule, IXmlRpcRouter
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         
@@ -59,7 +61,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule
         private bool m_Enabled = false;
         private string m_ServerURI = String.Empty;
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
         {
             IConfig startupConfig = config.Configs["Startup"];
             if (startupConfig == null)
@@ -75,27 +77,35 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcGridRouterModule
                     return;
                 }
 
-                scene.RegisterModuleInterface<IXmlRpcRouter>(this);
                 m_Enabled = true;
             }
         }
 
-        public void PostInitialise()
+        public void AddRegion(Scene scene)
+        {
+            scene.RegisterModuleInterface<IXmlRpcRouter>(this);
+        }
+        public void RegionLoaded(Scene scene)
         {
         }
 
-        public void Close()
+        public void RemoveRegion(Scene scene)
         {
+            scene.UnregisterModuleInterface<IXmlRpcRouter>(this);
         }
 
-        public string Name
+        public Type ReplaceableInterface
         {
-            get { return "XmlRpcGridRouterModule"; }
+            get { return null; }
         }
 
-        public bool IsSharedModule
+        public void Close()
         {
-            get { return false; }
+        }
+
+        public string Name
+        {
+            get { return "XmlRpcGridRouterModule"; }
         }
 
         public void RegisterNewReceiver(IScriptModule scriptEngine, UUID channel, UUID objectID, UUID itemID, string uri)
diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
index 32659c8..4d39345 100644
--- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Reflection;
 
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 
@@ -39,11 +40,12 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule
 {
-    public class XmlRpcRouter : IRegionModule, IXmlRpcRouter
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    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 = false;
+        public void Initialise(IConfigSource config)
         {
             IConfig startupConfig = config.Configs["Startup"];
             if (startupConfig == null)
@@ -52,26 +54,34 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule
             if (startupConfig.GetString("XmlRpcRouterModule",
                     "XmlRpcRouterModule") == "XmlRpcRouterModule")
             {
-                scene.RegisterModuleInterface<IXmlRpcRouter>(this);
+                m_enabled = true;
             }
         }
+        public void AddRegion(Scene scene)
+        {
+            scene.RegisterModuleInterface<IXmlRpcRouter>(this);
+        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
 
-        public void PostInitialise()
+        public void RemoveRegion(Scene scene)
         {
+            scene.UnregisterModuleInterface<IXmlRpcRouter>(this);
         }
 
-        public void Close()
+        public Type ReplaceableInterface
         {
+            get { return null; }
         }
 
-        public string Name
+        public void Close()
         {
-            get { return "XmlRpcRouterModule"; }
         }
 
-        public bool IsSharedModule
+        public string Name
         {
-            get { return false; }
+            get { return "XmlRpcRouterModule"; }
         }
 
         public void RegisterNewReceiver(IScriptModule scriptEngine, UUID channel, UUID objectID, UUID itemID, string uri)