diff options
author | Melanie Thielker | 2010-05-04 23:45:59 +0200 |
---|---|---|
committer | Melanie | 2010-05-04 21:26:10 +0100 |
commit | 3761f7997134f3515421e9cf19ebb775f296bef2 (patch) | |
tree | 7f838c7164b2fcc8ff2658a1c8933868cec59d60 /OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |
parent | make the events more useful by providing the source region (diff) | |
download | opensim-SC_OLD-3761f7997134f3515421e9cf19ebb775f296bef2.zip opensim-SC_OLD-3761f7997134f3515421e9cf19ebb775f296bef2.tar.gz opensim-SC_OLD-3761f7997134f3515421e9cf19ebb775f296bef2.tar.bz2 opensim-SC_OLD-3761f7997134f3515421e9cf19ebb775f296bef2.tar.xz |
Strip estate message sending out from the estate management module and
the dialog module. Convert it to an event on the estate module interface.
The old implementation did the same as message to region, a button that
is right next to it on the UI. This implementation prevented people from
adding a more sane one in a module.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs index dcc66ca..abd0fcb 100644 --- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | |||
@@ -50,6 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
50 | 50 | ||
51 | public event ChangeDelegate OnRegionInfoChange; | 51 | public event ChangeDelegate OnRegionInfoChange; |
52 | public event ChangeDelegate OnEstateInfoChange; | 52 | public event ChangeDelegate OnEstateInfoChange; |
53 | public event MessageDelegate OnEstateMessage; | ||
53 | 54 | ||
54 | #region Packet Data Responders | 55 | #region Packet Data Responders |
55 | 56 | ||
@@ -440,10 +441,7 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
440 | private void SendEstateBlueBoxMessage( | 441 | private void SendEstateBlueBoxMessage( |
441 | IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message) | 442 | IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message) |
442 | { | 443 | { |
443 | IDialogModule dm = m_scene.RequestModuleInterface<IDialogModule>(); | 444 | TriggerEstateMessage(senderID, senderName, message); |
444 | |||
445 | if (dm != null) | ||
446 | dm.SendNotificationToUsersInEstate(senderID, senderName, message); | ||
447 | } | 445 | } |
448 | 446 | ||
449 | private void handleEstateDebugRegionRequest(IClientAPI remote_client, UUID invoice, UUID senderID, bool scripted, bool collisionEvents, bool physics) | 447 | private void handleEstateDebugRegionRequest(IClientAPI remote_client, UUID invoice, UUID senderID, bool scripted, bool collisionEvents, bool physics) |
@@ -1177,5 +1175,13 @@ namespace OpenSim.Region.CoreModules.World.Estate | |||
1177 | if (change != null) | 1175 | if (change != null) |
1178 | change(m_scene.RegionInfo.RegionID); | 1176 | change(m_scene.RegionInfo.RegionID); |
1179 | } | 1177 | } |
1178 | |||
1179 | protected void TriggerEstateMessage(UUID fromID, string fromName, string message) | ||
1180 | { | ||
1181 | MessageDelegate onmessage = OnEstateMessage; | ||
1182 | |||
1183 | if (onmessage != null) | ||
1184 | onmessage(m_scene.RegionInfo.RegionID, fromID, fromName, message); | ||
1185 | } | ||
1180 | } | 1186 | } |
1181 | } | 1187 | } |