From 8cf945544cd993b68329d00832f7c9b74570af28 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Mon, 4 Aug 2014 00:43:57 +0100
Subject: local chat gods bug fix

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

diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 71ceb65..dcfc630 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -236,7 +236,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 fromName = avatar.Name;
                 fromID = c.Sender.AgentId;
                 if (avatar.GodLevel >= 200)
-                {
+                { // let gods speak to outside or things may get confusing
                     fromNamePrefix = m_adminPrefix;
                     checkParcelHide = false;
                 }
@@ -310,7 +310,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                             // objects on a parcel with access restrictions
                             if (checkParcelHide)
                             {
-                                if (sourceParcelID != Presencecheck.LandData.GlobalID)
+                                if (sourceParcelID != Presencecheck.LandData.GlobalID && presence.GodLevel < 200)
                                     return;
                             }
                             if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true)
-- 
cgit v1.1