1 files changed, 18 insertions, 14 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 483c25f..e1c0cd7 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -374,9 +374,11 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
             if (channel == DEBUG_CHANNEL)
                 return;
 
-            // Is id an avatar?
-            ScenePresence sp = m_scene.GetScenePresence(target);
+            if(target == UUID.Zero)
+                return;
 
+            // Is target an avatar?
+            ScenePresence sp = m_scene.GetScenePresence(target);
             if (sp != null)
             {
                  // Send message to avatar
@@ -401,19 +403,22 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                 foreach (SceneObjectGroup sog in attachments)
                 {
                     if (!sog.IsDeleted)
-                        targets.Add(sog.UUID);
+                    {
+                        SceneObjectPart[] parts = sog.Parts;
+                        foreach(SceneObjectPart p in parts)
+                            targets.Add(p.UUID);
+                    }
                 }
 
-                // Need to check each attachment
                 foreach (ListenerInfo li in m_listenerManager.GetListeners(UUID.Zero, channel, name, id, msg))
                 {
-                    if (li.GetHostID().Equals(id))
+                    UUID liHostID = li.GetHostID();
+                    if (liHostID.Equals(id))
                         continue;
-
-                    if (m_scene.GetSceneObjectPart(li.GetHostID()) == null)
+                    if (m_scene.GetSceneObjectPart(liHostID) == null)
                         continue;
-
-                    if (targets.Contains(li.GetHostID()))
+   
+                    if (targets.Contains(liHostID))
                         QueueMessage(new ListenerInfo(li, name, id, msg));
                 }
 
@@ -426,16 +431,15 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
 
             foreach (ListenerInfo li in m_listenerManager.GetListeners(UUID.Zero, channel, name, id, msg))
             {
+                UUID liHostID = li.GetHostID();
                 // Dont process if this message is from yourself!
-                if (li.GetHostID().Equals(id))
+                if (liHostID.Equals(id))
                     continue;
 
-                SceneObjectPart sPart = m_scene.GetSceneObjectPart(
-                        li.GetHostID());
-                if (sPart == null)
+                if (m_scene.GetSceneObjectPart(liHostID) == null)
                     continue;
 
-                if (li.GetHostID().Equals(target))
+                if (liHostID.Equals(target))
                 {
                     QueueMessage(new ListenerInfo(li, name, id, msg));
                     break;