OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Thank you kindly, Grumly57 for a patch to improve 

XMLRPCModule.cs: RemoteDataReply() and XMLRpcResponse()
0.6.0-stable
Charles Krinke 2008-05-25 17:58:10 +00:00
parent 042c9ed4d8
commit 5ac682ddf9
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Region/Environment/Modules/Scripting/XMLRPC/XMLRPCModule.cs
View File

@ -231,16 +231,33 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
public void RemoteDataReply(string channel, string message_id, string sdata, int idata) public void RemoteDataReply(string channel, string message_id, string sdata, int idata)
{ {
RPCRequestInfo rpcInfo;
LLUUID message_key = new LLUUID(message_id); LLUUID message_key = new LLUUID(message_id);
LLUUID channel_key = new LLUUID(channel);
if (m_rpcPendingResponses.TryGetValue(message_key, out rpcInfo)) RPCRequestInfo rpcInfo = null;
if (message_key == LLUUID.Zero)
{
foreach (RPCRequestInfo oneRpcInfo in m_rpcPendingResponses.Values)
if (oneRpcInfo.GetChannelKey() == channel_key)
rpcInfo = oneRpcInfo;
}
else
{
m_rpcPendingResponses.TryGetValue(message_key, out rpcInfo);
}
if (rpcInfo != null)
{ {
rpcInfo.SetStrRetval(sdata); rpcInfo.SetStrRetval(sdata);
rpcInfo.SetIntRetval(idata); rpcInfo.SetIntRetval(idata);
rpcInfo.SetProcessed(true); rpcInfo.SetProcessed(true);
m_rpcPendingResponses.Remove(message_key); m_rpcPendingResponses.Remove(message_key);
} }
else
{
m_log.Warn("[RemoteDataReply]: Channel or message_id not found");
}
} }
/********************************************** /**********************************************
@ -378,7 +395,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
RPCChannelInfo rpcChanInfo; RPCChannelInfo rpcChanInfo;
if (m_openChannels.TryGetValue(channel, out rpcChanInfo)) if (m_openChannels.TryGetValue(channel, out rpcChanInfo))
{ {
string intVal = (string) requestData["IntValue"]; string intVal = Convert.ToInt32(requestData["IntValue"]).ToString();
string strVal = (string) requestData["StringValue"]; string strVal = (string) requestData["StringValue"];
RPCRequestInfo rpcInfo; RPCRequestInfo rpcInfo;
@ -402,7 +419,7 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
{ {
Hashtable param = new Hashtable(); Hashtable param = new Hashtable();
param["StringValue"] = rpcInfo.GetStrRetval(); param["StringValue"] = rpcInfo.GetStrRetval();
param["IntValue"] = Convert.ToString(rpcInfo.GetIntRetval()); param["IntValue"] = rpcInfo.GetIntRetval();
ArrayList parameters = new ArrayList(); ArrayList parameters = new ArrayList();
parameters.Add(param); parameters.Add(param);