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.
---
 .../CoreModules/Scripting/XMLRPC/XMLRPCModule.cs   | 51 +++++-----------------
 1 file changed, 10 insertions(+), 41 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs')

diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index a9147fb6..27b64bf 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -32,7 +32,6 @@ using System.Net;
 using System.Reflection;
 using System.Threading;
 using log4net;
-using Mono.Addins;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenMetaverse;
@@ -77,8 +76,7 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class XMLRPCModule : ISharedRegionModule, IXMLRPC
+    public class XMLRPCModule : IRegionModule, IXMLRPC
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -96,9 +94,9 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
         private int RemoteReplyScriptWait = 300;
         private object XMLRPCListLock = new object();
 
-        #region ISharedRegionModule Members
+        #region IRegionModule Members
 
-        public void Initialise(IConfigSource config)
+        public void Initialise(Scene scene, IConfigSource config)
         {
             // We need to create these early because the scripts might be calling
             // But since this gets called for every region, we need to make sure they
@@ -118,14 +116,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
                 {
                 }
             }
-        }
-
-        public void PostInitialise()
-        {
-        }
 
-        public void AddRegion(Scene scene)
-        {
             if (!m_scenes.Contains(scene))
             {
                 m_scenes.Add(scene);
@@ -134,12 +125,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
             }
         }
 
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
-        private Dictionary<Scene, BaseHttpServer> m_HttpServers = new Dictionary<Scene, BaseHttpServer>();
-        public void RegionLoaded(Scene scene)
+        public void PostInitialise()
         {
             if (IsEnabled())
             {
@@ -147,31 +133,9 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
                 // Attach xmlrpc handlers
                 m_log.Info("[REMOTE_DATA]: " +
                            "Starting XMLRPC Server on port " + m_remoteDataPort + " for llRemoteData commands.");
-                BaseHttpServer httpServer = new BaseHttpServer((uint)m_remoteDataPort);
+                BaseHttpServer httpServer = new BaseHttpServer((uint) m_remoteDataPort);
                 httpServer.AddXmlRPCHandler("llRemoteData", XmlRpcRemoteData);
                 httpServer.Start();
-                m_HttpServers.Add(scene, httpServer);
-            }
-        }
-
-        public void RemoveRegion(Scene scene)
-        {
-            if (m_scenes.Contains(scene))
-                m_scenes.Remove(scene);
-            scene.UnregisterModuleInterface<IXMLRPC>(this);
-            if (IsEnabled())
-            {
-                // Start http server
-                // Attach xmlrpc handlers
-                if (m_HttpServers.ContainsKey(scene))
-                {
-                    BaseHttpServer httpServer;
-                    m_HttpServers.TryGetValue(scene, out httpServer);
-                    m_log.Info("[REMOTE_DATA]: " +
-                               "Stopping XMLRPC Server on port " + m_remoteDataPort + " for llRemoteData commands.");
-                    httpServer.RemoveXmlRPCHandler("llRemoteData");
-                    httpServer.Stop();
-                }
             }
         }
 
@@ -184,6 +148,11 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
             get { return m_name; }
         }
 
+        public bool IsSharedModule
+        {
+            get { return true; }
+        }
+
         public int Port
         {
             get { return m_remoteDataPort; }
-- 
cgit v1.1