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

sending. With this change, all methods that handle IM now use GridInstantMessage
rather than individual parameters.

2 files changed, 2 insertions, 12 deletions

diff --git a/OpenSim/Framework/Client/IClientIM.cs b/OpenSim/Framework/Client/IClientIM.cs
index 04c6d6c..81b1d9e 100644
--- a/OpenSim/Framework/Client/IClientIM.cs
+++ b/OpenSim/Framework/Client/IClientIM.cs
@@ -61,13 +61,7 @@ namespace OpenSim.Framework.Client
 
     public interface IClientIM
     {
-        void SendInstantMessage(UUID fromAgent, string message, UUID toAgent,
-                                string fromName, byte dialog, uint timeStamp);
-
-        void SendInstantMessage(UUID fromAgent, string message, UUID toAgent,
-                                string fromName, byte dialog, uint timeStamp,
-                                UUID transactionID, bool fromGroup,
-                                byte[] binaryBucket);
+        void SendInstantMessage(GridInstantMessage im);
 
         event ImprovedInstantMessage OnInstantMessage;
     }
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index bef1bfc..350134c 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -815,11 +815,7 @@ namespace OpenSim.Framework
         void SendChatMessage(string message, byte type, Vector3 fromPos, string fromName, UUID fromAgentID, byte source,
                              byte audible);
 
-        void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog,
-                                uint timeStamp);
-
-        void SendInstantMessage(UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog,
-                                uint timeStamp, UUID transactionID, bool fromGroup, byte[] binaryBucket);
+        void SendInstantMessage(GridInstantMessage im);
 
         void SendGenericMessage(string method, List<string> message);