From Michael Osias (IBM)

This patch makes some enhancements to the llRemoteData functions.  The
module is now a shared module, and allows remote data channels to be
created among multiple regions in the same sim.  The port is controlled
from the remoteDataPort property under the [Network] section in
OpenSim.ini.  If this setting is not present or = 0, the module is
disabled and no port is opened.  llRemoteData commands have not effect
when module is disabled.

2 files changed, 9 insertions, 6 deletions

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index aaac294..40c6533 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -2044,9 +2044,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         public void llOpenRemoteDataChannel()
         {
             IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>();
-            LLUUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID);
-            object[] resobj = new object[] {1, channelID.ToString(), LLUUID.Zero.ToString(), "", 0, ""};
-            m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(m_localID, m_itemID, "remote_data", resobj);
+            if (xmlrpcMod.IsEnabled())
+            {
+                LLUUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID);
+                object[] resobj = new object[] { 1, channelID.ToString(), LLUUID.Zero.ToString(), "", 0, "" };
+                m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(m_localID, m_itemID, "remote_data", resobj);
+            }
         }
 
         public string llSendRemoteData(string channel, string dest, int idata, string sdata)
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs
index ddc0c62..fdd7260 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs
@@ -213,7 +213,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             while ( httpInfo != null )
             {
                 
-                Console.WriteLine("PICKED HTTP REQ:" + httpInfo.response_body + httpInfo.status);
+                //Console.WriteLine("PICKED HTTP REQ:" + httpInfo.response_body + httpInfo.status);
 
                 // Deliver data to prim's remote_data handler
                 //
@@ -249,7 +249,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
                 while (xmlrpc.hasRequests())
                 {
                     RPCRequestInfo rInfo = xmlrpc.GetNextRequest();
-                    Console.WriteLine("PICKED REQUEST");
+                    //Console.WriteLine("PICKED REQUEST");
 
                     //Deliver data to prim's remote_data handler
                     object[] resobj = new object[]
@@ -284,4 +284,4 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
             }
         }
     }
-}
\ No newline at end of file
+}