From bf604c85c66dd3bed06e3103cdf210ede02c151f Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sun, 24 Jul 2016 15:17:25 +0100
Subject: add missing IM parameter ( needs fix where it is really relevant )

---
 OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 6dd2ffd..68fe8d9 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -953,7 +953,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// Send an instant message to this client
         /// </summary>
         //
-        // Don't remove transaction ID! Groups and item gives need to set it!
         public void SendInstantMessage(GridInstantMessage im)
         {
             if (((Scene)(m_scene)).Permissions.CanInstantMessage(new UUID(im.fromAgentID), new UUID(im.toAgentID)))
@@ -962,14 +961,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     = (ImprovedInstantMessagePacket)PacketPool.Instance.GetPacket(PacketType.ImprovedInstantMessage);
 
                 msg.AgentData.AgentID = new UUID(im.fromAgentID);
-                msg.AgentData.SessionID = UUID.Zero;
+                msg.AgentData.SessionID = new UUID(im.imSessionID);
                 msg.MessageBlock.FromAgentName = Util.StringToBytes256(im.fromAgentName);
                 msg.MessageBlock.Dialog = im.dialog;
                 msg.MessageBlock.FromGroup = im.fromGroup;
-                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.ID = new UUID(im.ID);
                 msg.MessageBlock.Offline = im.offline;
                 msg.MessageBlock.ParentEstateID = im.ParentEstateID;
                 msg.MessageBlock.Position = im.Position;
-- 
cgit v1.1