simplify DeliverChatToAvatars(..) ( hopefully not breaking it )

1 files changed, 62 insertions, 73 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 3b56ca6..ee0a4f8 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
             UUID fromID = UUID.Zero;
             UUID ownerID = UUID.Zero;
             string message = c.Message;
-            IScene scene = c.Scene;
+            Scene scene = c.Scene as Scene;
             UUID destination = c.Destination;
             Vector3 fromPos = c.Position;
             Vector3 regionPos = new Vector3(scene.RegionInfo.WorldLocX, scene.RegionInfo.WorldLocY, 0);
@@ -217,47 +217,48 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
 
             if (c.Channel == DEBUG_CHANNEL) c.Type = ChatTypeEnum.DebugChannel;
 
+            if(!m_scenes.Contains(scene))
+            {
+                m_log.WarnFormat("[CHAT]: message from unkown scene {0} ignored",
+                                     scene.RegionInfo.RegionName);
+                return;
+            }
+
             switch (sourceType) 
             {
-            case ChatSourceType.Agent:
-                if (!(scene is Scene))
-                {
-                    m_log.WarnFormat("[CHAT]: scene {0} is not a Scene object, cannot obtain scene presence for {1}",
-                                     scene.RegionInfo.RegionName, c.Sender.AgentId);
-                    return;
-                }
-                ScenePresence avatar = (scene as Scene).GetScenePresence(c.Sender.AgentId);
-                fromPos = avatar.AbsolutePosition;
-                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;
-                }
-                else
-                {
-                    checkParcelHide = true;
-                }
-                destination = UUID.Zero; // Avatars cant "SayTo"
-                ownerID = c.Sender.AgentId;
+                case ChatSourceType.Agent:
+                    ScenePresence avatar = (scene as Scene).GetScenePresence(c.Sender.AgentId);
+                    fromPos = avatar.AbsolutePosition;
+                    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;
+                    }
+                    else
+                    {
+                        checkParcelHide = true;
+                    }
+                    destination = UUID.Zero; // Avatars cant "SayTo"
+                    ownerID = c.Sender.AgentId;
                 
-                hidePos = fromPos;
-                break;
+                    hidePos = fromPos;
+                    break;
 
-            case ChatSourceType.Object:
-                fromID = c.SenderUUID;
+                case ChatSourceType.Object:
+                    fromID = c.SenderUUID;
 
-                if (c.SenderObject != null && c.SenderObject is SceneObjectPart)
-                {
-                    ownerID = ((SceneObjectPart)c.SenderObject).OwnerID;
-                    if (((SceneObjectPart)c.SenderObject).ParentGroup.IsAttachment)
+                    if (c.SenderObject != null && c.SenderObject is SceneObjectPart)
                     {
-                        checkParcelHide = true;
-                        hidePos = ((SceneObjectPart)c.SenderObject).ParentGroup.AbsolutePosition;
+                        ownerID = ((SceneObjectPart)c.SenderObject).OwnerID;
+                        if (((SceneObjectPart)c.SenderObject).ParentGroup.IsAttachment)
+                        {
+                            checkParcelHide = true;
+                            hidePos = ((SceneObjectPart)c.SenderObject).ParentGroup.AbsolutePosition;
+                        }
                     }
-                }
-                break;
+                    break;
             }
 
             // TODO: iterate over message
@@ -275,7 +276,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 checkParcelHide = false;
                 if (c.Type < ChatTypeEnum.DebugChannel && destination == UUID.Zero)
                 {
-                    ILandObject srcland = (scene as Scene).LandChannel.GetLandObject(hidePos.X, hidePos.Y);
+                    ILandObject srcland = scene.LandChannel.GetLandObject(hidePos.X, hidePos.Y);
                     if (srcland != null && !srcland.LandData.SeeAVs)
                     {
                         sourceParcelID = srcland.LandData.GlobalID;
@@ -284,54 +285,42 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
                 }
             }
 
-            foreach (Scene s in m_scenes)
-            {
-                // This should use ForEachClient, but clients don't have a position.
-                // If camera is moved into client, then camera position can be used
-                // MT: No, it can't, as chat is heard from the avatar position, not
-                // the camera position.
-
-                s.ForEachScenePresence(
-                    delegate(ScenePresence presence)
-                    {
-                        if (receiverIDs.Contains(presence.UUID))
-                            return; // already sent to this presence
+            scene.ForEachScenePresence(
+                delegate(ScenePresence presence)
+                {
+                    if (destination != UUID.Zero && presence.UUID != destination)
+                        return;
 
-                        if (destination != UUID.Zero && presence.UUID != destination)
+                    if(presence.IsChildAgent)
+                        {
+                            if(checkParcelHide)
+                                return;
+                            if (TrySendChatMessage(presence, fromPos, regionPos, fromID,
+                                        ownerID, fromNamePrefix + fromName, c.Type,
+                                        message, sourceType, (destination != UUID.Zero)))
+                                receiverIDs.Add(presence.UUID);
                             return;
+                        }
 
-                        ILandObject Presencecheck = s.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y);
-                        if (Presencecheck != null)
+                    ILandObject Presencecheck = scene.LandChannel.GetLandObject(presence.AbsolutePosition.X,            presence.AbsolutePosition.Y);
+                    if (Presencecheck != null)
+                    {
+                        if (checkParcelHide)
                         {
-                            // 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 (checkParcelHide)
-                            {
-                                if (sourceParcelID != Presencecheck.LandData.GlobalID && presence.GodLevel < 200)
-                                    return;
-                            }
-                            if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true)
-                            {
-                                if (TrySendChatMessage(presence, fromPos, regionPos, fromID,
-                                            ownerID, fromNamePrefix + fromName, c.Type,
-                                            message, sourceType, (destination != UUID.Zero)))
-                                    receiverIDs.Add(presence.UUID);
-                            }
+                            if (sourceParcelID != Presencecheck.LandData.GlobalID && presence.GodLevel < 200)
+                                return;
                         }
-                        else if(!checkParcelHide && (presence.IsChildAgent))
+                        if (c.Sender == null || Presencecheck.IsEitherBannedOrRestricted(c.Sender.AgentId) != true)
                         {
                             if (TrySendChatMessage(presence, fromPos, regionPos, fromID,
-                                            ownerID, fromNamePrefix + fromName, c.Type,
-                                            message, sourceType, (destination != UUID.Zero)))
+                                        ownerID, fromNamePrefix + fromName, c.Type,
+                                        message, sourceType, (destination != UUID.Zero)))
                                 receiverIDs.Add(presence.UUID);
                         }
                     }
-                );
-            }
+                });
             
-            (scene as Scene).EventManager.TriggerOnChatToClients(
+            scene.EventManager.TriggerOnChatToClients(
                 fromID, receiverIDs, message, c.Type, fromPos, fromName, sourceType, ChatAudibleLevel.Fully);
         }