From 0d26e271c9a60d959b643500a83aee3e67c4d035 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 29 Jun 2012 01:02:22 +0200
Subject: stop chat being sent to child avs again.

---
 OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 357c2af..6215526 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -352,9 +352,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                                                   UUID fromAgentID, string fromName, ChatTypeEnum type,
                                                   string message, ChatSourceType src)
         {
-            // don't send llRegionSay to child agents. Send normal chat because you
-            // can't talk across sim borders if it's not done
-            if (type == ChatTypeEnum.Broadcast && presence.IsChildAgent) return false;
+            // don't send chat to child agents
+            if (presence.IsChildAgent) return false;
 
             Vector3 fromRegionPos = fromPos + regionPos;
             Vector3 toRegionPos = presence.AbsolutePosition +
-- 
cgit v1.1


From e9e409a7948b98a4f0befd6f49ca4d2cb1cabe60 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 29 Jun 2012 22:37:16 +0200
Subject: Remove spammy debug

---
 OpenSim/Region/CoreModules/World/Land/LandObject.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 4284444..5974112 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -200,7 +200,7 @@ namespace OpenSim.Region.CoreModules.World.Land
                               * (long)m_scene.RegionInfo.ObjectCapacity
                               * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus
                               / 65536L);
-                m_log.DebugFormat("Area: {0}, Capacity {1}, Bonus {2}, Parcel {3}", LandData.Area, m_scene.RegionInfo.ObjectCapacity, m_scene.RegionInfo.RegionSettings.ObjectBonus, parcelMax);
+                //m_log.DebugFormat("Area: {0}, Capacity {1}, Bonus {2}, Parcel {3}", LandData.Area, m_scene.RegionInfo.ObjectCapacity, m_scene.RegionInfo.RegionSettings.ObjectBonus, parcelMax);
                 return parcelMax;
             }
         }
-- 
cgit v1.1