aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorSean Dague2007-12-13 19:50:21 +0000
committerSean Dague2007-12-13 19:50:21 +0000
commitf773733fcb6ef18ddb70d597cdf6f1e334dcf13e (patch)
treedd59cbd8f684a9fc4f0ad656738857170905c6b2 /OpenSim/Region/ScriptEngine
parentEnabled the sit_ground animation. The sit state is not properly set, but it ... (diff)
downloadopensim-SC_OLD-f773733fcb6ef18ddb70d597cdf6f1e334dcf13e.zip
opensim-SC_OLD-f773733fcb6ef18ddb70d597cdf6f1e334dcf13e.tar.gz
opensim-SC_OLD-f773733fcb6ef18ddb70d597cdf6f1e334dcf13e.tar.bz2
opensim-SC_OLD-f773733fcb6ef18ddb70d597cdf6f1e334dcf13e.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs9
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/LSLLongCmdHandler.cs6
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
2044 public void llOpenRemoteDataChannel() 2044 public void llOpenRemoteDataChannel()
2045 { 2045 {
2046 IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>(); 2046 IXMLRPC xmlrpcMod = m_ScriptEngine.World.RequestModuleInterface<IXMLRPC>();
2047 LLUUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID); 2047 if (xmlrpcMod.IsEnabled())
2048 object[] resobj = new object[] {1, channelID.ToString(), LLUUID.Zero.ToString(), "", 0, ""}; 2048 {
2049 m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(m_localID, m_itemID, "remote_data", resobj); 2049 LLUUID channelID = xmlrpcMod.OpenXMLRPCChannel(m_localID, m_itemID);
2050 object[] resobj = new object[] { 1, channelID.ToString(), LLUUID.Zero.ToString(), "", 0, "" };
2051 m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(m_localID, m_itemID, "remote_data", resobj);
2052 }
2050 } 2053 }
2051 2054
2052 public string llSendRemoteData(string channel, string dest, int idata, string sdata) 2055 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
213 while ( httpInfo != null ) 213 while ( httpInfo != null )
214 { 214 {
215 215
216 Console.WriteLine("PICKED HTTP REQ:" + httpInfo.response_body + httpInfo.status); 216 //Console.WriteLine("PICKED HTTP REQ:" + httpInfo.response_body + httpInfo.status);
217 217
218 // Deliver data to prim's remote_data handler 218 // Deliver data to prim's remote_data handler
219 // 219 //
@@ -249,7 +249,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
249 while (xmlrpc.hasRequests()) 249 while (xmlrpc.hasRequests())
250 { 250 {
251 RPCRequestInfo rInfo = xmlrpc.GetNextRequest(); 251 RPCRequestInfo rInfo = xmlrpc.GetNextRequest();
252 Console.WriteLine("PICKED REQUEST"); 252 //Console.WriteLine("PICKED REQUEST");
253 253
254 //Deliver data to prim's remote_data handler 254 //Deliver data to prim's remote_data handler
255 object[] resobj = new object[] 255 object[] resobj = new object[]
@@ -284,4 +284,4 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
284 } 284 }
285 } 285 }
286 } 286 }
287} \ No newline at end of file 287}