From a11edceb00b5b86f825bd957bdac9edb91f893dd Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 2 Sep 2015 19:54:53 +0100
Subject: seems to compile ( tests comented out)

---
 .../Scripting/WorldComm/WorldCommModule.cs            | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs')

diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 1c3a714..93a4f09 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -380,28 +380,13 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
 
             if (sp != null)
             {
-<<<<<<< HEAD
-                // ignore if a child agent this is restricted to inside one
-                // region
-                if (sp.IsChildAgent)
-                    return;
-
-                // Channel zero only goes to the avatar
-                // non zero channel messages only go to the attachments of the avatar.
-                if (channel != 0)
-                {
-                    List<SceneObjectGroup> attachments = sp.GetAttachments();
-                    if (attachments.Count == 0)
-                        return;
-=======
-                // Send message to avatar
+                 // Send message to avatar
                 if (channel == 0)
                 {
-                    // Channel 0 goes to viewer ONLY
+                   // Channel 0 goes to viewer ONLY
                     m_scene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Broadcast, 0, pos, name, id, target, false, false);
                     return true;
                 }
->>>>>>> avn/ubitvar
 
                 List<SceneObjectGroup> attachments = sp.GetAttachments();
 
-- 
cgit v1.1