From 3761f7997134f3515421e9cf19ebb775f296bef2 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Tue, 4 May 2010 23:45:59 +0200
Subject: 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.

---
 .../CoreModules/World/Estate/EstateManagementModule.cs     | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/CoreModules/World')

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
 
         public event ChangeDelegate OnRegionInfoChange;
         public event ChangeDelegate OnEstateInfoChange;
+        public event MessageDelegate OnEstateMessage;
 
         #region Packet Data Responders
 
@@ -440,10 +441,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
         private void SendEstateBlueBoxMessage(
             IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message)
         {
-            IDialogModule dm = m_scene.RequestModuleInterface<IDialogModule>();
-            
-            if (dm != null)
-                dm.SendNotificationToUsersInEstate(senderID, senderName, message);
+            TriggerEstateMessage(senderID, senderName, message);
         }
 
         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
             if (change != null)
                 change(m_scene.RegionInfo.RegionID);
         }
+
+        protected void TriggerEstateMessage(UUID fromID, string fromName, string message)
+        {
+            MessageDelegate onmessage = OnEstateMessage;
+
+            if (onmessage != null)
+                onmessage(m_scene.RegionInfo.RegionID, fromID, fromName, message);
+        }
     }
 }
-- 
cgit v1.1