From d3510def00902d244bdaf4d312128eed7e765650 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Sat, 30 Aug 2008 21:52:09 +0000
Subject: * If a general alert message is sent out, only send it to avatars in
 the scene (not child agents). * This foxed me in the osgrid meeting last week

---
 OpenSim/Region/Environment/Scenes/Scene.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 22b7c00..2b242fc 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -3142,7 +3142,7 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         /// <summary>
-        ///
+        /// Send an alert messages to all avatars in this scene.
         /// </summary>
         /// <param name="message"></param>
         public void SendGeneralAlert(string message)
@@ -3151,12 +3151,13 @@ namespace OpenSim.Region.Environment.Scenes
 
             foreach (ScenePresence presence in presenceList)
             {
-                presence.ControllingClient.SendAlertMessage(message);
+                if (!presence.IsChildAgent)
+                    presence.ControllingClient.SendAlertMessage(message);
             }
         }
 
         /// <summary>
-        ///
+        /// Send an alert message to a particular agent.
         /// </summary>
         /// <param name="agentID"></param>
         /// <param name="message"></param>
@@ -3347,7 +3348,8 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         /// <summary>
-        ///
+        /// Handle an alert command from the console.
+        /// FIXME: Command parsing code really shouldn't be in this core Scene class.
         /// </summary>
         /// <param name="commandParams"></param>
         public void HandleAlertCommand(string[] commandParams)
-- 
cgit v1.1