ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Thank you, Grumly57 kindly for:

Browse Source 
This patch proposes a new function : osOpenRemoteDataChannel(key channeID) 
that allow to open an XMLRPC channel for remote_data event. The difference 
is that the channelID can be customized instead of being randomly generated.
This commit is contained in:
Charles Krinke
2008-05-28 02:06:56 +00:00
parent 5f2b8fd5e1
commit 6d51eef9ce
6 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,6 +160,10 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
*
* Generate a LLUUID channel key and add it and
* the prim id to dictionary <channelUUID, primUUID>
*
* A custom channel key can be proposed.
* Otherwise, passing LLUUID.Zero will generate
* and return a random channel
*
* First check if there is a channel assigned for
* this itemID. If there is, then someone called
@@ -169,9 +173,9 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
*
* ********************************************/
public LLUUID OpenXMLRPCChannel(uint localID, LLUUID itemID)
public LLUUID OpenXMLRPCChannel(uint localID, LLUUID itemID, LLUUID channelID)
{
LLUUID channel = new LLUUID();
LLUUID newChannel = LLUUID.Zero;
//Is a dupe?
foreach (RPCChannelInfo ci in m_openChannels.Values)
@@ -179,22 +183,22 @@ namespace OpenSim.Region.Environment.Modules.Scripting.XMLRPC
if (ci.GetItemID().Equals(itemID))
{
// return the original channel ID for this item
channel = ci.GetChannelID();
newChannel = ci.GetChannelID();
break;
}
}
if (channel == LLUUID.Zero)
if (newChannel == LLUUID.Zero)
{
channel = LLUUID.Random();
RPCChannelInfo rpcChanInfo = new RPCChannelInfo(localID, itemID, channel);
newChannel = (channelID == LLUUID.Zero) ? LLUUID.Random() : channelID;
RPCChannelInfo rpcChanInfo = new RPCChannelInfo(localID, itemID, newChannel);
lock (XMLRPCListLock)
{
m_openChannels.Add(channel, rpcChanInfo);
m_openChannels.Add(newChannel, rpcChanInfo);
}
}
return channel;
return newChannel;
}
// Delete channels based on itemID