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
mb-throttle-test
Justin Clark-Casey (justincc) 2014-09-26 23:35:29 +01:00
parent 36a1f1c70c
commit 31c8b7fd1a
1 changed files with 2 additions and 8 deletions

View File

@ -379,15 +379,9 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
if (sp.IsChildAgent) if (sp.IsChildAgent)
return; return;
// Send message to the avatar.
// Channel zero only goes to the avatar // Channel zero only goes to the avatar
// non zero channel messages only go to the attachments // non zero channel messages only go to the attachments of the avatar.
if (channel == 0) if (channel != 0)
{
m_scene.SimChatToAgent(target, Utils.StringToBytes(msg),
pos, name, id, false);
}
else
{ {
List<SceneObjectGroup> attachments = sp.GetAttachments(); List<SceneObjectGroup> attachments = sp.GetAttachments();
if (attachments.Count == 0) if (attachments.Count == 0)