aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-08 19:05:22 +0000
committerJustin Clarke Casey2009-01-08 19:05:22 +0000
commit9a97a6866ffeae85e959747195c139bfdbcac0e7 (patch)
tree03851460f70af5e38e19ffe75f080e4333b4e6bc /OpenSim/Region/Environment/Modules/World
parent* refactor: move code for sending a message to all users in a region to the D... (diff)
downloadopensim-SC-9a97a6866ffeae85e959747195c139bfdbcac0e7.zip
opensim-SC-9a97a6866ffeae85e959747195c139bfdbcac0e7.tar.gz
opensim-SC-9a97a6866ffeae85e959747195c139bfdbcac0e7.tar.bz2
opensim-SC-9a97a6866ffeae85e959747195c139bfdbcac0e7.tar.xz
* refactor: move estate dialog to DialogModule
* This appeared only to be implemented for the region, and doesn't currently seem to work anyway
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs11
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
index 33e354e..d906bbd 100644
--- a/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Estate/EstateManagementModule.cs
@@ -352,7 +352,8 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
352 } 352 }
353 } 353 }
354 354
355 private void SendSimulatorBlueBoxMessage(IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message) 355 private void SendSimulatorBlueBoxMessage(
356 IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message)
356 { 357 {
357 IDialogModule dm = m_scene.RequestModuleInterface<IDialogModule>(); 358 IDialogModule dm = m_scene.RequestModuleInterface<IDialogModule>();
358 359
@@ -360,9 +361,13 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
360 dm.SendNotificationToUsersInRegion(senderID, senderName, message); 361 dm.SendNotificationToUsersInRegion(senderID, senderName, message);
361 } 362 }
362 363
363 private void SendEstateBlueBoxMessage(IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message) 364 private void SendEstateBlueBoxMessage(
365 IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message)
364 { 366 {
365 m_scene.SendEstateMessageFromEstateTools(senderID, sessionID, senderName, message); 367 IDialogModule dm = m_scene.RequestModuleInterface<IDialogModule>();
368
369 if (dm != null)
370 dm.SendNotificationToUsersInEstate(senderID, senderName, message);
366 } 371 }
367 372
368 private void handleEstateDebugRegionRequest(IClientAPI remote_client, UUID invoice, UUID senderID, bool scripted, bool collisionEvents, bool physics) 373 private void handleEstateDebugRegionRequest(IClientAPI remote_client, UUID invoice, UUID senderID, bool scripted, bool collisionEvents, bool physics)