OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the general alert message so it doesn't get sent to child agents

avinationmerge
meta7 2010-08-07 08:17:11 -07:00
parent b017d985ab
commit 19debab060
1 changed files with 223 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

443
OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
View File

@ -1,220 +1,223 @@
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders. * See CONTRIBUTORS.TXT for a full list of copyright holders.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the * * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products * names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission. * derived from this software without specific prior written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using OpenMetaverse; using OpenMetaverse;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces; using OpenSim.Services.Interfaces;
namespace OpenSim.Region.CoreModules.Avatar.Dialog namespace OpenSim.Region.CoreModules.Avatar.Dialog
{ {
public class DialogModule : IRegionModule, IDialogModule public class DialogModule : IRegionModule, IDialogModule
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected Scene m_scene; protected Scene m_scene;
public void Initialise(Scene scene, IConfigSource source) public void Initialise(Scene scene, IConfigSource source)
{ {
m_scene = scene; m_scene = scene;
m_scene.RegisterModuleInterface<IDialogModule>(this); m_scene.RegisterModuleInterface<IDialogModule>(this);
m_scene.AddCommand( m_scene.AddCommand(
this, "alert", "alert <first> <last> <message>", "Send an alert to a user", HandleAlertConsoleCommand); this, "alert", "alert <first> <last> <message>", "Send an alert to a user", HandleAlertConsoleCommand);
m_scene.AddCommand( m_scene.AddCommand(
this, "alert general", "alert general <message>", "Send an alert to everyone", HandleAlertConsoleCommand); this, "alert general", "alert general <message>", "Send an alert to everyone", HandleAlertConsoleCommand);
m_scene.AddCommand( m_scene.AddCommand(
this, "alert dialog", "alert dialog <message>", "Send a dialog alert to everyone", HandleAlertConsoleCommand); this, "alert dialog", "alert dialog <message>", "Send a dialog alert to everyone", HandleAlertConsoleCommand);
} }
public void PostInitialise() {} public void PostInitialise() {}
public void Close() {} public void Close() {}
public string Name { get { return "Dialog Module"; } } public string Name { get { return "Dialog Module"; } }
public bool IsSharedModule { get { return false; } } public bool IsSharedModule { get { return false; } }
public void SendAlertToUser(IClientAPI client, string message) public void SendAlertToUser(IClientAPI client, string message)
{ {
SendAlertToUser(client, message, false); SendAlertToUser(client, message, false);
} }
public void SendAlertToUser(IClientAPI client, string message, bool modal) public void SendAlertToUser(IClientAPI client, string message, bool modal)
{ {
client.SendAgentAlertMessage(message, modal); client.SendAgentAlertMessage(message, modal);
} }
public void SendAlertToUser(UUID agentID, string message) public void SendAlertToUser(UUID agentID, string message)
{ {
SendAlertToUser(agentID, message, false); SendAlertToUser(agentID, message, false);
} }
public void SendAlertToUser(UUID agentID, string message, bool modal) public void SendAlertToUser(UUID agentID, string message, bool modal)
{ {
ScenePresence sp = m_scene.GetScenePresence(agentID); ScenePresence sp = m_scene.GetScenePresence(agentID);
if (sp != null) if (sp != null)
sp.ControllingClient.SendAgentAlertMessage(message, modal); sp.ControllingClient.SendAgentAlertMessage(message, modal);
} }
public void SendAlertToUser(string firstName, string lastName, string message, bool modal) public void SendAlertToUser(string firstName, string lastName, string message, bool modal)
{ {
ScenePresence presence = m_scene.GetScenePresence(firstName, lastName); ScenePresence presence = m_scene.GetScenePresence(firstName, lastName);
if (presence != null) if (presence != null)
presence.ControllingClient.SendAgentAlertMessage(message, modal); presence.ControllingClient.SendAgentAlertMessage(message, modal);
} }
public void SendGeneralAlert(string message) public void SendGeneralAlert(string message)
{ {
m_scene.ForEachScenePresence(delegate(ScenePresence presence) m_scene.ForEachScenePresence(delegate(ScenePresence presence)
{ {
presence.ControllingClient.SendAlertMessage(message); if (!presence.IsChildAgent)
}); {
} presence.ControllingClient.SendAlertMessage(message);
}
public void SendDialogToUser( });
UUID avatarID, string objectName, UUID objectID, UUID ownerID, }
string message, UUID textureID, int ch, string[] buttonlabels)
{ public void SendDialogToUser(
UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerID); UUID avatarID, string objectName, UUID objectID, UUID ownerID,
string ownerFirstName, ownerLastName; string message, UUID textureID, int ch, string[] buttonlabels)
if (account != null) {
{ UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerID);
ownerFirstName = account.FirstName; string ownerFirstName, ownerLastName;
ownerLastName = account.LastName; if (account != null)
} {
else ownerFirstName = account.FirstName;
{ ownerLastName = account.LastName;
ownerFirstName = "(unknown"; }
ownerLastName = "user)"; else
} {
ownerFirstName = "(unknown";
ScenePresence sp = m_scene.GetScenePresence(avatarID); ownerLastName = "user)";
if (sp != null) }
sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels);
} ScenePresence sp = m_scene.GetScenePresence(avatarID);
if (sp != null)
public void SendUrlToUser( sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels);
UUID avatarID, string objectName, UUID objectID, UUID ownerID, bool groupOwned, string message, string url) }
{
ScenePresence sp = m_scene.GetScenePresence(avatarID); public void SendUrlToUser(
UUID avatarID, string objectName, UUID objectID, UUID ownerID, bool groupOwned, string message, string url)
if (sp != null) {
sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url); ScenePresence sp = m_scene.GetScenePresence(avatarID);
}
if (sp != null)
public void SendTextBoxToUser(UUID avatarid, string message, int chatChannel, string name, UUID objectid, UUID ownerid) sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url);
{ }
UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid);
string ownerFirstName, ownerLastName; public void SendTextBoxToUser(UUID avatarid, string message, int chatChannel, string name, UUID objectid, UUID ownerid)
if (account != null) {
{ UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid);
ownerFirstName = account.FirstName; string ownerFirstName, ownerLastName;
ownerLastName = account.LastName; if (account != null)
} {
else ownerFirstName = account.FirstName;
{ ownerLastName = account.LastName;
ownerFirstName = "(unknown"; }
ownerLastName = "user)"; else
} {
ownerFirstName = "(unknown";
ScenePresence sp = m_scene.GetScenePresence(avatarid); ownerLastName = "user)";
}
if (sp != null)
sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerFirstName, ownerLastName, objectid); ScenePresence sp = m_scene.GetScenePresence(avatarid);
}
if (sp != null)
public void SendNotificationToUsersInRegion( sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerFirstName, ownerLastName, objectid);
UUID fromAvatarID, string fromAvatarName, string message) }
{
m_scene.ForEachScenePresence(delegate(ScenePresence presence) public void SendNotificationToUsersInRegion(
{ UUID fromAvatarID, string fromAvatarName, string message)
if (!presence.IsChildAgent) {
presence.ControllingClient.SendBlueBoxMessage(fromAvatarID, fromAvatarName, message); m_scene.ForEachScenePresence(delegate(ScenePresence presence)
}); {
} if (!presence.IsChildAgent)
presence.ControllingClient.SendBlueBoxMessage(fromAvatarID, fromAvatarName, message);
/// <summary> });
/// Handle an alert command from the console. }
/// </summary>
/// <param name="module"></param> /// <summary>
/// <param name="cmdparams"></param> /// Handle an alert command from the console.
public void HandleAlertConsoleCommand(string module, string[] cmdparams) /// </summary>
{ /// <param name="module"></param>
if (m_scene.ConsoleScene() != null && m_scene.ConsoleScene() != m_scene) /// <param name="cmdparams"></param>
return; public void HandleAlertConsoleCommand(string module, string[] cmdparams)
{
if (cmdparams[1] == "general") if (m_scene.ConsoleScene() != null && m_scene.ConsoleScene() != m_scene)
{ return;
string message = CombineParams(cmdparams, 2);
if (cmdparams[1] == "general")
m_log.InfoFormat( {
"[DIALOG]: Sending general alert in region {0} with message {1}", m_scene.RegionInfo.RegionName, message); string message = CombineParams(cmdparams, 2);
SendGeneralAlert(message);
} m_log.InfoFormat(
else if (cmdparams[1] == "dialog") "[DIALOG]: Sending general alert in region {0} with message {1}", m_scene.RegionInfo.RegionName, message);
{ SendGeneralAlert(message);
string message = CombineParams(cmdparams, 2); }
else if (cmdparams[1] == "dialog")
m_log.InfoFormat( {
"[DIALOG]: Sending dialog alert in region {0} with message {1}", m_scene.RegionInfo.RegionName, message); string message = CombineParams(cmdparams, 2);
SendNotificationToUsersInRegion(UUID.Zero, "System", message);
} m_log.InfoFormat(
else "[DIALOG]: Sending dialog alert in region {0} with message {1}", m_scene.RegionInfo.RegionName, message);
{ SendNotificationToUsersInRegion(UUID.Zero, "System", message);
string firstName = cmdparams[1]; }
string lastName = cmdparams[2]; else
string message = CombineParams(cmdparams, 3); {
string firstName = cmdparams[1];
m_log.InfoFormat( string lastName = cmdparams[2];
"[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}", string message = CombineParams(cmdparams, 3);
m_scene.RegionInfo.RegionName, firstName, lastName, message);
SendAlertToUser(firstName, lastName, message, false); m_log.InfoFormat(
} "[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}",
} m_scene.RegionInfo.RegionName, firstName, lastName, message);
SendAlertToUser(firstName, lastName, message, false);
private string CombineParams(string[] commandParams, int pos) }
{ }
string result = string.Empty;
for (int i = pos; i < commandParams.Length; i++) private string CombineParams(string[] commandParams, int pos)
{ {
result += commandParams[i] + " "; string result = string.Empty;
} for (int i = pos; i < commandParams.Length; i++)
{
return result; result += commandParams[i] + " ";
} }
}
} return result;
}
}
}