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.

---
 OpenSim/Framework/Client/IClientIM.cs | 4 +++-
 OpenSim/Framework/IClientAPI.cs       | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Client/IClientIM.cs b/OpenSim/Framework/Client/IClientIM.cs
index a3498c2..1d55d10 100644
--- a/OpenSim/Framework/Client/IClientIM.cs
+++ b/OpenSim/Framework/Client/IClientIM.cs
@@ -39,7 +39,9 @@ namespace OpenSim.Framework.Client
 
         void SendInstantMessage(UUID fromAgent, string message, UUID toAgent,
                                 string fromName, byte dialog, uint timeStamp,
-                                bool fromGroup, byte[] binaryBucket);
+                                UUID transactionID, bool fromGroup,
+                                byte[] binaryBucket);
+
         event ImprovedInstantMessage OnInstantMessage;
     }
 }
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 061676e..7a3931f 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -741,7 +741,7 @@ namespace OpenSim.Framework
                                 uint timeStamp);
 
         void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog,
-                                uint timeStamp, bool fromGroup, byte[] binaryBucket);
+                                uint timeStamp, UUID transactionID, bool fromGroup, byte[] binaryBucket);
 
         void SendGenericMessage(string method, List<string> message);
 
@@ -1027,4 +1027,4 @@ namespace OpenSim.Framework
 
         void KillEndDone();
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1