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

Change the client API to use GridInstantMessage for the "last mile" of IM

Browse Source 
sending. With this change, all methods that handle IM now use GridInstantMessage
rather than individual parameters.
This commit is contained in:
Melanie Thielker
2009-03-29 05:42:27 +00:00
parent 404bfdc9a6
commit c483206fd7
12 changed files with 61 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
View File

@@ -212,11 +212,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
// And notify. Transaction ID is the item ID. We get that
// same ID back on the reply so we know what to act on
//
user.ControllingClient.SendInstantMessage(
new UUID(im.fromAgentID), im.message,
new UUID(im.toAgentID),
im.fromAgentName, im.dialog, im.timestamp,
copyID, false, im.binaryBucket);
user.ControllingClient.SendInstantMessage(im);
return;
}
@@ -232,11 +228,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
if (user != null) // Local
{
user.ControllingClient.SendInstantMessage(
new UUID(im.fromAgentID), im.message,
new UUID(im.toAgentID),
im.fromAgentName, im.dialog, im.timestamp,
UUID.Zero, false, im.binaryBucket);
user.ControllingClient.SendInstantMessage(im);
}
else
{
@@ -303,11 +295,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
if (user != null) // Local
{
user.ControllingClient.SendInstantMessage(
new UUID(im.fromAgentID), im.message,
new UUID(im.toAgentID),
im.fromAgentName, im.dialog, im.timestamp,
UUID.Zero, false, im.binaryBucket);
user.ControllingClient.SendInstantMessage(im);
}
else
{
@@ -460,11 +448,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
// Deliver message
//
user.ControllingClient.SendInstantMessage(
new UUID(msg.fromAgentID), msg.message,
new UUID(msg.toAgentID),
msg.fromAgentName, msg.dialog, msg.timestamp,
folderID, false, msg.binaryBucket);
user.ControllingClient.SendInstantMessage(msg);
}
else
{
@@ -497,11 +481,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
// Deliver message
//
user.ControllingClient.SendInstantMessage(
new UUID(msg.fromAgentID), msg.message,
new UUID(msg.toAgentID),
msg.fromAgentName, msg.dialog, msg.timestamp,
itemID, false, msg.binaryBucket);
user.ControllingClient.SendInstantMessage(msg);
}
}
}