From a0c3297b37d2aa7c9c778e667380fbe31f41a243 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 24 Nov 2015 15:12:39 +0000 Subject: [PATCH] again chat echos, check repeats uncondicionally --- OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index ff2527e417..3b56ca6627 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs @@ -294,9 +294,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat s.ForEachScenePresence( delegate(ScenePresence presence) { - if (destination != UUID.Zero && - (presence.UUID != destination || receiverIDs.Contains(presence.UUID))) + if (receiverIDs.Contains(presence.UUID)) + return; // already sent to this presence + + if (destination != UUID.Zero && presence.UUID != destination) return; + ILandObject Presencecheck = s.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y); if (Presencecheck != null) {