aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-09-26 23:35:29 +0100
committerJustin Clark-Casey (justincc)2014-09-26 23:35:29 +0100
commit31c8b7fd1a2be4e334c9293cf4372c540cfb47df (patch)
tree6aa480b1c681192e1ba3161996b9decef5af06a9 /OpenSim
parentAdd missing HGInventoryService responsible for creating My Suitcase to Standa... (diff)
downloadopensim-SC-31c8b7fd1a2be4e334c9293cf4372c540cfb47df.zip
opensim-SC-31c8b7fd1a2be4e334c9293cf4372c540cfb47df.tar.gz
opensim-SC-31c8b7fd1a2be4e334c9293cf4372c540cfb47df.tar.bz2
opensim-SC-31c8b7fd1a2be4e334c9293cf4372c540cfb47df.tar.xz
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
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs10
1 files changed, 2 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 2c2c99c..3484387 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
379 if (sp.IsChildAgent) 379 if (sp.IsChildAgent)
380 return; 380 return;
381 381
382 // Send message to the avatar.
383 // Channel zero only goes to the avatar 382 // Channel zero only goes to the avatar
384 // non zero channel messages only go to the attachments 383 // non zero channel messages only go to the attachments of the avatar.
385 if (channel == 0) 384 if (channel != 0)
386 {
387 m_scene.SimChatToAgent(target, Utils.StringToBytes(msg),
388 pos, name, id, false);
389 }
390 else
391 { 385 {
392 List<SceneObjectGroup> attachments = sp.GetAttachments(); 386 List<SceneObjectGroup> attachments = sp.GetAttachments();
393 if (attachments.Count == 0) 387 if (attachments.Count == 0)