From bdf9add8d1191b08bdaa9706484ac5da1f91af52 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sun, 9 Nov 2008 01:16:42 +0000
Subject: Reintroduce transactionID to the parameter list for
 SendInstantMessage. It is required by group IM and also for a proper
 implementation of item give, group notice attachments and offline IM.

---
 .../Modules/Avatar/InstantMessage/InstantMessageModule.cs           | 4 ++--
 .../Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules/Avatar')

diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
index a673f7b..eb82ad7 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -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;
                     }
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index d8b203f..b134591 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -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))
                         {
-- 
cgit v1.1