From 81186e76b68e9f6ba8c03a48fb5f7a43b0eea7a1 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Sat, 24 Jul 2010 10:43:57 -0700
Subject: [PATCH] Add an m_enabled flag to XmlRpcRouterModule so it won't try
 to bind the xmlrpc_uri event if it's not mentioned in the ini.

---
 .../XmlRpcRouterModule/XmlRpcRouterModule.cs         | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
index 32659c8e5d..dcac4a98e6 100644
--- a/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule
     public class XmlRpcRouter : IRegionModule, IXmlRpcRouter
     {
         //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
+        private bool m_enabled = false;
         public void Initialise(Scene scene, IConfigSource config)
         {
             IConfig startupConfig = config.Configs["Startup"];
@@ -53,6 +53,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule
                     "XmlRpcRouterModule") == "XmlRpcRouterModule")
             {
                 scene.RegisterModuleInterface<IXmlRpcRouter>(this);
+                m_enabled = true;
+            }
+            else
+            {
+                m_enabled = false;
             }
         }
 
@@ -76,7 +81,10 @@ namespace OpenSim.Region.OptionalModules.Scripting.XmlRpcRouterModule
 
         public void RegisterNewReceiver(IScriptModule scriptEngine, UUID channel, UUID objectID, UUID itemID, string uri)
         {
-            scriptEngine.PostScriptEvent(itemID, "xmlrpc_uri", new Object[] {uri});
+            if (m_enabled)
+            {
+                scriptEngine.PostScriptEvent(itemID, "xmlrpc_uri", new Object[] { uri });
+            }
         }
 
         public void ScriptRemoved(UUID itemID)