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

formatting DialogModule for 80-character width terminal

integration
SignpostMarv 2012-11-10 09:05:32 +00:00 committed by Diva Canto
parent 5cba04e2d6
commit fb7bbe167a
1 changed files with 73 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
HandleAlertConsoleCommand); HandleAlertConsoleCommand);
m_scene.AddCommand( m_scene.AddCommand(
"Users", this, "alert-user", "alert-user <first> <last> <message>", "Users", this, "alert-user",
"alert-user <first> <last> <message>",
"Send an alert to a user", "Send an alert to a user",
HandleAlertConsoleCommand); HandleAlertConsoleCommand);
} }
@ -89,7 +90,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
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);
} }
@ -107,11 +109,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
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)
@ -122,11 +129,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
}); });
} }
public void SendDialogToUser( public void SendDialogToUser(UUID avatarID, string objectName,
UUID avatarID, string objectName, UUID objectID, UUID ownerID, UUID objectID, UUID ownerID, string message, UUID textureID,
string message, UUID textureID, int ch, string[] buttonlabels) int ch, string[] buttonlabels)
{ {
UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerID); UserAccount account = m_scene.UserAccountService.GetUserAccount(
m_scene.RegionInfo.ScopeID, ownerID);
string ownerFirstName, ownerLastName; string ownerFirstName, ownerLastName;
if (account != null) if (account != null)
{ {
@ -141,22 +149,31 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
ScenePresence sp = m_scene.GetScenePresence(avatarID); ScenePresence sp = m_scene.GetScenePresence(avatarID);
if (sp != null) if (sp != null)
sp.ControllingClient.SendDialog( {
objectName, objectID, ownerID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels); sp.ControllingClient.SendDialog(objectName, objectID, ownerID,
ownerFirstName, ownerLastName, message, textureID, ch,
buttonlabels);
}
} }
public void SendUrlToUser( public void SendUrlToUser(UUID avatarID, string objectName,
UUID avatarID, string objectName, UUID objectID, UUID ownerID, bool groupOwned, string message, string url) UUID objectID, UUID ownerID, bool groupOwned, string message,
string url)
{ {
ScenePresence sp = m_scene.GetScenePresence(avatarID); ScenePresence sp = m_scene.GetScenePresence(avatarID);
if (sp != null) if (sp != null)
sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url); {
sp.ControllingClient.SendLoadURL(objectName, objectID,
ownerID, groupOwned, message, url);
}
} }
public void SendTextBoxToUser(UUID avatarid, string message, int chatChannel, string name, UUID objectid, UUID ownerid) public void SendTextBoxToUser(UUID avatarid, string message,
int chatChannel, string name, UUID objectid, UUID ownerid)
{ {
UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid); UserAccount account = m_scene.UserAccountService.GetUserAccount(
m_scene.RegionInfo.ScopeID, ownerid);
string ownerFirstName, ownerLastName; string ownerFirstName, ownerLastName;
UUID ownerID = UUID.Zero; UUID ownerID = UUID.Zero;
if (account != null) if (account != null)
@ -174,15 +191,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
ScenePresence sp = m_scene.GetScenePresence(avatarid); ScenePresence sp = m_scene.GetScenePresence(avatarid);
if (sp != null) if (sp != null)
sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerID, ownerFirstName, ownerLastName, objectid); {
sp.ControllingClient.SendTextBoxRequest(message, chatChannel,
name, ownerID, ownerFirstName, ownerLastName,
objectid);
}
} }
public void SendNotificationToUsersInRegion( public void SendNotificationToUsersInRegion(UUID fromAvatarID,
UUID fromAvatarID, string fromAvatarName, string message) string fromAvatarName, string message)
{ {
m_scene.ForEachRootClient(delegate(IClientAPI client) m_scene.ForEachRootClient(delegate(IClientAPI client)
{ {
client.SendBlueBoxMessage(fromAvatarID, fromAvatarName, message); client.SendBlueBoxMessage(fromAvatarID, fromAvatarName,
message);
}); });
} }
@ -191,10 +213,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
/// </summary> /// </summary>
/// <param name="module"></param> /// <param name="module"></param>
/// <param name="cmdparams"></param> /// <param name="cmdparams"></param>
public void HandleAlertConsoleCommand(string module, string[] cmdparams) public void HandleAlertConsoleCommand(string module,
string[] cmdparams)
{
if (m_scene.ConsoleScene() != null &&
m_scene.ConsoleScene() != m_scene)
{ {
if (m_scene.ConsoleScene() != null && m_scene.ConsoleScene() != m_scene)
return; return;
}
string message = string.Empty; string message = string.Empty;
@ -210,9 +236,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
string firstName = cmdparams[1]; string firstName = cmdparams[1];
string lastName = cmdparams[2]; string lastName = cmdparams[2];
message = CombineParams(cmdparams, 3); message = CombineParams(cmdparams, 3);
m_log.InfoFormat( m_log.InfoFormat("[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}",
"[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}", m_scene.RegionInfo.RegionName, firstName, lastName,
m_scene.RegionInfo.RegionName, firstName, lastName, message); message);
SendAlertToUser(firstName, lastName, message, false); SendAlertToUser(firstName, lastName, message, false);
} }
else else