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

Reintroduce transactionID to the parameter list for SendInstantMessage.

Browse Source 
It is required by group IM and also for a proper implementation of item
give, group notice attachments and offline IM.
This commit is contained in:
Melanie Thielker
2008-11-09 01:16:42 +00:00
parent 62bc9c2e8e
commit bdf9add8d1
7 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
View File

@@ -162,7 +162,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
{
user.ControllingClient.SendInstantMessage(fromAgentID, message,
toAgentID, fromAgentName, dialog,
timestamp, fromGroup, binaryBucket);
timestamp, UUID.Zero, fromGroup, binaryBucket);
// Message sent
return;
}
@@ -179,7 +179,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage
user.ControllingClient.SendInstantMessage(fromAgentID, message,
toAgentID, fromAgentName, dialog,
timestamp, fromGroup, binaryBucket);
timestamp, UUID.Zero, fromGroup, binaryBucket);
// Message sent
return;
}

6
OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
View File

@@ -136,7 +136,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
user.ControllingClient.SendInstantMessage(
fromAgentID, message, toAgentID, fromAgentName,
dialog, timestamp, false, binaryBucket);
dialog, timestamp, UUID.Zero, false, binaryBucket);
return;
}
@@ -168,7 +168,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
{
user.ControllingClient.SendInstantMessage(
fromAgentID, message, toAgentID, fromAgentName,
dialog, timestamp, false, binaryBucket);
dialog, timestamp, UUID.Zero, false, binaryBucket);
if (m_pendingOffers.ContainsKey(imSessionID))
{
@@ -214,7 +214,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory.Transfer
{
user.ControllingClient.SendInstantMessage(
fromAgentID, message, toAgentID, fromAgentName,
dialog, timestamp, false, binaryBucket);
dialog, timestamp, UUID.Zero, false, binaryBucket);
if (m_pendingOffers.ContainsKey(imSessionID))
{

2
OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
View File

@@ -476,7 +476,7 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
}
public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp, bool fromGroup, byte[] binaryBucket)
public void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, uint timeStamp, UUID transationID, bool fromGroup, byte[] binaryBucket)
{
}