again chat echos, check repeats uncondicionally

1 files changed, 5 insertions, 2 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index ff2527e..3b56ca6 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)
                         {