aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-08-30 21:52:09 +0000
committerJustin Clarke Casey2008-08-30 21:52:09 +0000
commitd3510def00902d244bdaf4d312128eed7e765650 (patch)
tree506f8ddaf2844bb73a205077a23345312e2b5489 /OpenSim/Region/Environment/Scenes
parent* Committed patch in mantis 623 (diff)
downloadopensim-SC_OLD-d3510def00902d244bdaf4d312128eed7e765650.zip
opensim-SC_OLD-d3510def00902d244bdaf4d312128eed7e765650.tar.gz
opensim-SC_OLD-d3510def00902d244bdaf4d312128eed7e765650.tar.bz2
opensim-SC_OLD-d3510def00902d244bdaf4d312128eed7e765650.tar.xz
* 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
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs10
1 files changed, 6 insertions, 4 deletions
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
3142 } 3142 }
3143 3143
3144 /// <summary> 3144 /// <summary>
3145 /// 3145 /// Send an alert messages to all avatars in this scene.
3146 /// </summary> 3146 /// </summary>
3147 /// <param name="message"></param> 3147 /// <param name="message"></param>
3148 public void SendGeneralAlert(string message) 3148 public void SendGeneralAlert(string message)
@@ -3151,12 +3151,13 @@ namespace OpenSim.Region.Environment.Scenes
3151 3151
3152 foreach (ScenePresence presence in presenceList) 3152 foreach (ScenePresence presence in presenceList)
3153 { 3153 {
3154 presence.ControllingClient.SendAlertMessage(message); 3154 if (!presence.IsChildAgent)
3155 presence.ControllingClient.SendAlertMessage(message);
3155 } 3156 }
3156 } 3157 }
3157 3158
3158 /// <summary> 3159 /// <summary>
3159 /// 3160 /// Send an alert message to a particular agent.
3160 /// </summary> 3161 /// </summary>
3161 /// <param name="agentID"></param> 3162 /// <param name="agentID"></param>
3162 /// <param name="message"></param> 3163 /// <param name="message"></param>
@@ -3347,7 +3348,8 @@ namespace OpenSim.Region.Environment.Scenes
3347 } 3348 }
3348 3349
3349 /// <summary> 3350 /// <summary>
3350 /// 3351 /// Handle an alert command from the console.
3352 /// FIXME: Command parsing code really shouldn't be in this core Scene class.
3351 /// </summary> 3353 /// </summary>
3352 /// <param name="commandParams"></param> 3354 /// <param name="commandParams"></param>
3353 public void HandleAlertCommand(string[] commandParams) 3355 public void HandleAlertCommand(string[] commandParams)