From 31c8b7fd1a2be4e334c9293cf4372c540cfb47df Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Fri, 26 Sep 2014 23:35:29 +0100 Subject: [PATCH] Fix recent regression with llRegionSayTo() started sending messages twice. Addresses http://opensimulator.org/mantis/view.php?id=7330 Fixed by removing chat delivery to avatar from WorldCommModule.DeliverMessageTo(), in common with existing similar methods that only handle deliver to script listeners. Preserves fixes from http://opensimulator.org/mantis/view.php?id=5005 --- .../CoreModules/Scripting/WorldComm/WorldCommModule.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs index 2c2c99caa6..34843876e0 100644 --- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs @@ -379,15 +379,9 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm if (sp.IsChildAgent) return; - // Send message to the avatar. // Channel zero only goes to the avatar - // non zero channel messages only go to the attachments - if (channel == 0) - { - m_scene.SimChatToAgent(target, Utils.StringToBytes(msg), - pos, name, id, false); - } - else + // non zero channel messages only go to the attachments of the avatar. + if (channel != 0) { List attachments = sp.GetAttachments(); if (attachments.Count == 0)