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 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/ClientStack')
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;
--
cgit v1.1