1 files changed, 35 insertions, 35 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 8358bc0..176c86d 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -308,56 +308,56 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
         /// <param name='msg'>
         /// Message.
         /// </param>
-        public void DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg)
+        public bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg, out string error)
         {
+            error = null;
             // Is id an avatar?
             ScenePresence sp = m_scene.GetScenePresence(target);
 
             if (sp != null)
             {
-                // ignore if a child agent this is restricted to inside one region
-                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
+                // Send message to avatar
                 if (channel == 0)
                 {
-                    m_scene.SimChatToAgent(target, Utils.StringToBytes(msg), pos, name, id, false);
-               }
-                else
-                {
-                    List<SceneObjectGroup> attachments = sp.GetAttachments();
-                    if (attachments.Count == 0)
-                        return;
+                    m_scene.SimChatBroadcast(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, false);
+                }
 
-                    // Get uuid of attachments
-                    List<UUID> targets = new List<UUID>();
-                    foreach (SceneObjectGroup sog in attachments)
-                    {
-                        if (!sog.IsDeleted)
-                            targets.Add(sog.UUID);
-                    }
+                List<SceneObjectGroup> attachments = sp.GetAttachments();
 
-                    // Need to check each attachment
-                    foreach (ListenerInfo li in m_listenerManager.GetListeners(UUID.Zero, channel, name, id, msg))
-                    {
-                        if (li.GetHostID().Equals(id))
-                            continue;
+                if (attachments.Count == 0)
+                    return true;
 
-                        if (m_scene.GetSceneObjectPart(li.GetHostID()) == null)
-                            continue;
+                // Get uuid of attachments
+                List<UUID> targets = new List<UUID>();
+                foreach (SceneObjectGroup sog in attachments)
+                {
+                    if (!sog.IsDeleted)
+                        targets.Add(sog.UUID);
+                }
 
-                        if (targets.Contains(li.GetHostID()))
-                            QueueMessage(new ListenerInfo(li, name, id, msg));
-                    }
+                // Need to check each attachment
+                foreach (ListenerInfo li in m_listenerManager.GetListeners(UUID.Zero, channel, name, id, msg))
+                {
+                    if (li.GetHostID().Equals(id))
+                        continue;
+
+                    if (m_scene.GetSceneObjectPart(li.GetHostID()) == null)
+                        continue;
+
+                    if (targets.Contains(li.GetHostID()))
+                        QueueMessage(new ListenerInfo(li, name, id, msg));
                 }
 
-                return;
+                return true;
+            }
+
+            // Need to toss an error here
+            if (channel == 0)
+            {
+                error = "Cannot use llRegionSayTo to message objects on channel 0";
+                return false;
             }
 
-            // No avatar found so look for an object
             foreach (ListenerInfo li in m_listenerManager.GetListeners(UUID.Zero, channel, name, id, msg))
             {
                 // Dont process if this message is from yourself!
@@ -375,7 +375,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                 }
             }
 
-            return;
+            return true;
         }
 
         protected void QueueMessage(ListenerInfo li)