* 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
0.6.0-stable
Justin Clarke Casey 2008-08-30 21:52:09 +00:00
parent c713ec8223
commit d3510def00
1 changed files with 6 additions and 4 deletions

View File

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