From 16a7232f55f4166cad6c4a198a22b5e171977754 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 28 Jul 2016 08:22:51 +0100
Subject:  revert adding a new IM parameter ( commit
 bf604c85c66dd3bed06e3103cdf210ede02c151f , that was a mistake. this should
 fix invites accepts etc, that got broken

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs             | 8 ++++++--
 .../CoreModules/Avatar/InstantMessage/MessageTransferModule.cs    | 6 ------
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 0bb5dc6..26fc85e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -961,11 +961,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     = (ImprovedInstantMessagePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedInstantMessage);
 
                 msg.AgentData.AgentID = new UUID(im.fromAgentID);
-                msg.AgentData.SessionID = new UUID(im.imSessionID);
+                msg.AgentData.SessionID = UUID.Zero;
                 msg.MessageBlock.FromAgentName = Util.StringToBytes256(im.fromAgentName);
                 msg.MessageBlock.Dialog = im.dialog;
                 msg.MessageBlock.FromGroup = im.fromGroup;
-                msg.MessageBlock.ID = new UUID(im.ID);
+                // this is odd
+                if (im.imSessionID == UUID.Zero.Guid)
+                    msg.MessageBlock.ID = new UUID(im.fromAgentID) ^ new UUID(im.toAgentID);
+                else
+                    msg.MessageBlock.ID = new UUID(im.imSessionID);                
                 msg.MessageBlock.Offline = im.offline;
                 msg.MessageBlock.ParentEstateID = im.ParentEstateID;
                 msg.MessageBlock.Position = im.Position;
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index 1366103..6b120fb 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -216,7 +216,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 UUID fromAgentID = UUID.Zero;
                 UUID toAgentID = UUID.Zero;
                 UUID imSessionID = UUID.Zero;
-                UUID imID = UUID.Zero;
                 uint timestamp = 0;
                 string fromAgentName = "";
                 string message = "";
@@ -263,7 +262,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     UUID.TryParse((string)requestData["to_agent_id"], out toAgentID);
                     UUID.TryParse((string)requestData["im_session_id"], out imSessionID);
                     UUID.TryParse((string)requestData["region_id"], out RegionID);
-                    UUID.TryParse((string)requestData["id"], out imID);
 
                     try
                     {
@@ -391,8 +389,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                     gim.ParentEstateID = ParentEstateID;
                     gim.Position = Position;
                     gim.binaryBucket = binaryBucket;
-                    gim.ID = imID.Guid;
-
 
                     // Trigger the Instant message in the scene.
                     foreach (Scene scene in m_Scenes)
@@ -702,8 +698,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             gim["from_agent_session"] = UUID.Zero.ToString();
             gim["to_agent_id"] = msg.toAgentID.ToString();
             gim["im_session_id"] = msg.imSessionID.ToString();
-            if(msg.ID != Guid.Empty)
-                gim["id"] = msg.ID.ToString();
             gim["timestamp"] = msg.timestamp.ToString();
             gim["from_agent_name"] = msg.fromAgentName;
             gim["message"] = msg.message;
-- 
cgit v1.1