From f9280374d2e44f66145718c880119383c2dc2a71 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Fri, 30 Jul 2010 15:03:03 +0200
Subject: Bannination fixes. Objects in nonpublic parcels were muted by
 default. Gods were muted, too.

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

(limited to 'OpenSim/Region/CoreModules/Avatar')

diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 9c8cbc6..50d2f9d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -244,7 +244,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                         ILandObject Presencecheck = s.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y);
                         if (Presencecheck != null)
                         {
-                            if (Presencecheck.IsEitherBannedOrRestricted(c.SenderUUID) != true)
+                            // This will pass all chat from objects. Not
+                            // perfect, but it will do. For now. Better
+                            // than the prior behavior of muting all
+                            // objects on a parcel with access restrictions
+                            if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true)
                             {
                                 TrySendChatMessage(presence, fromPos, regionPos, fromID, fromNamePrefix+fromName, c.Type, message, sourceType);
                             }
-- 
cgit v1.1