remove duplicate object chat messages ( mantis 7745 ),fix llRegionSay, this are still merge issues

1 files changed, 5 insertions, 0 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 1a53a8b..9282897 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -311,6 +311,7 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
             // Determine which listen event filters match the given set of arguments, this results
             // in a limited set of listeners, each belonging a host. If the host is in range, add them
             // to the pending queue.
+
             foreach (ListenerInfo li
                     in m_listenerManager.GetListeners(UUID.Zero, channel,
                     name, id, msg))
@@ -386,6 +387,10 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                     return true;
                 }
 
+                // for now messages to prims don't cross regions
+                if(sp.IsChildAgent)
+                    return false;
+
                 List<SceneObjectGroup> attachments = sp.GetAttachments();
 
                 if (attachments.Count == 0)