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

* refactor: move estate dialog to DialogModule 

* This appeared only to be implemented for the region, and doesn't currently seem to work anyway
0.6.2-post-fixes
Justin Clarke Casey 2009-01-08 19:05:22 +00:00
parent 17f783457b
commit 9a97a6866f
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/Environment/Interfaces/IDialogModule.cs
View File

@ -90,6 +90,19 @@ namespace OpenSim.Region.Environment.Interfaces
/// <param name="fromAvatarID">The user sending the message</param> /// <param name="fromAvatarID">The user sending the message</param>
/// <param name="fromAvatarName">The name of the user doing the sending</param> /// <param name="fromAvatarName">The name of the user doing the sending</param>
/// <param name="message">The message being sent to the user</param> /// <param name="message">The message being sent to the user</param>
void SendNotificationToUsersInRegion(UUID fromAvatarID, string fromAvatarName, string message); void SendNotificationToUsersInRegion(UUID fromAvatarID, string fromAvatarName, string message);
/// <summary>
/// Send a notification to all users in the estate. This notification should remain around until the
/// user explicitly dismisses it.
/// </summary>
///
/// On the Linden Labs Second Client (as of 1.21), this is a big blue box message on the upper right of the
/// screen.
///
/// <param name="fromAvatarID">The user sending the message</param>
/// <param name="fromAvatarName">The name of the user doing the sending</param>
/// <param name="message">The message being sent to the user</param>
void SendNotificationToUsersInEstate(UUID fromAvatarID, string fromAvatarName, string message);
} }
} }

10
OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs
View File

@ -99,7 +99,15 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Dialog
if (!presence.IsChildAgent) if (!presence.IsChildAgent)
presence.ControllingClient.SendAlertMessage(message); presence.ControllingClient.SendAlertMessage(message);
} }
} }
public void SendNotificationToUsersInEstate(
UUID fromAvatarID, string fromAvatarName, string message)
{
// TODO: This does not yet do what it says on the tin - it only sends the message to users in the same
// region as the sending avatar.
SendNotificationToUsersInRegion(fromAvatarID, fromAvatarName, message);
}
public void SendNotificationToUsersInRegion( public void SendNotificationToUsersInRegion(
UUID fromAvatarID, string fromAvatarName, string message) UUID fromAvatarID, string fromAvatarName, string message)

11
OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
View File

@ -352,7 +352,8 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
} }
} }
private void SendSimulatorBlueBoxMessage(IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message) private void SendSimulatorBlueBoxMessage(
IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message)
{ {
IDialogModule dm = m_scene.RequestModuleInterface<IDialogModule>(); IDialogModule dm = m_scene.RequestModuleInterface<IDialogModule>();
@ -360,9 +361,13 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
dm.SendNotificationToUsersInRegion(senderID, senderName, message); dm.SendNotificationToUsersInRegion(senderID, senderName, message);
} }
private void SendEstateBlueBoxMessage(IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message) private void SendEstateBlueBoxMessage(
IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message)
{ {
m_scene.SendEstateMessageFromEstateTools(senderID, sessionID, senderName, message); IDialogModule dm = m_scene.RequestModuleInterface<IDialogModule>();
if (dm != null)
dm.SendNotificationToUsersInEstate(senderID, senderName, message);
} }
private void handleEstateDebugRegionRequest(IClientAPI remote_client, UUID invoice, UUID senderID, bool scripted, bool collisionEvents, bool physics) private void handleEstateDebugRegionRequest(IClientAPI remote_client, UUID invoice, UUID senderID, bool scripted, bool collisionEvents, bool physics)