aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-08 18:50:46 +0000
committerJustin Clarke Casey2009-01-08 18:50:46 +0000
commit17f783457b8dbd182f8184ef77c72d57d7c8da8b (patch)
tree2ab67061f34d29f724ee13ebec4a9ca884cdd5da /OpenSim/Region/Environment/Modules
parentUpdate svn properties, minor formatting cleanup. (diff)
downloadopensim-SC_OLD-17f783457b8dbd182f8184ef77c72d57d7c8da8b.zip
opensim-SC_OLD-17f783457b8dbd182f8184ef77c72d57d7c8da8b.tar.gz
opensim-SC_OLD-17f783457b8dbd182f8184ef77c72d57d7c8da8b.tar.bz2
opensim-SC_OLD-17f783457b8dbd182f8184ef77c72d57d7c8da8b.tar.xz
* refactor: move code for sending a message to all users in a region to the DialogModule
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs18
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs7
2 files changed, 17 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs
index 430968d..b64ec71 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs
@@ -90,10 +90,6 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Dialog
90 } 90 }
91 } 91 }
92 92
93 /// <summary>
94 /// Send an alert messages to all avatars in this scene.
95 /// </summary>
96 /// <param name="message"></param>
97 public void SendGeneralAlert(string message) 93 public void SendGeneralAlert(string message)
98 { 94 {
99 List<ScenePresence> presenceList = m_scene.GetScenePresences(); 95 List<ScenePresence> presenceList = m_scene.GetScenePresences();
@@ -103,6 +99,18 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Dialog
103 if (!presence.IsChildAgent) 99 if (!presence.IsChildAgent)
104 presence.ControllingClient.SendAlertMessage(message); 100 presence.ControllingClient.SendAlertMessage(message);
105 } 101 }
106 } 102 }
103
104 public void SendNotificationToUsersInRegion(
105 UUID fromAvatarID, string fromAvatarName, string message)
106 {
107 List<ScenePresence> presenceList = m_scene.GetScenePresences();
108
109 foreach (ScenePresence presence in presenceList)
110 {
111 if (!presence.IsChildAgent)
112 presence.ControllingClient.SendBlueBoxMessage(fromAvatarID, fromAvatarName, message);
113 }
114 }
107 } 115 }
108} 116}
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index 14450ae..33e354e 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -51,8 +51,6 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
51 51
52 private void sendDetailedEstateData(IClientAPI remote_client, UUID invoice) 52 private void sendDetailedEstateData(IClientAPI remote_client, UUID invoice)
53 { 53 {
54 //SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant)
55
56 uint sun = 0; 54 uint sun = 0;
57 55
58 if (!m_scene.RegionInfo.EstateSettings.UseGlobalTime) 56 if (!m_scene.RegionInfo.EstateSettings.UseGlobalTime)
@@ -356,7 +354,10 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
356 354
357 private void SendSimulatorBlueBoxMessage(IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message) 355 private void SendSimulatorBlueBoxMessage(IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message)
358 { 356 {
359 m_scene.SendRegionMessageFromEstateTools(senderID, sessionID, senderName, message); 357 IDialogModule dm = m_scene.RequestModuleInterface<IDialogModule>();
358
359 if (dm != null)
360 dm.SendNotificationToUsersInRegion(senderID, senderName, message);
360 } 361 }
361 362
362 private void SendEstateBlueBoxMessage(IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message) 363 private void SendEstateBlueBoxMessage(IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message)