4 files changed, 12 insertions, 25 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index c31266c..da38ede 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -132,14 +132,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
                 sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url);
         }
         
-        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 SendTextBoxToUser(UUID avatarid, string message, int chatChannel, string name, UUID objectid, UUID ownerid)
         {
              UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid);
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);
+        }
     }
 }
diff --git a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
index 35b4b63..be9764a 100644
--- a/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs
@@ -120,19 +120,6 @@ namespace OpenSim.Region.Framework.Interfaces
         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);
-
-        /// <summary>
         /// Send a textbox entry for the client to respond to
         /// </summary>
         void SendTextBoxToUser(UUID avatarid, string message, int chatChannel, string name, UUID objectid, UUID ownerid);
diff --git a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
index 329c3f5..c850f7f 100644
--- a/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs
@@ -30,11 +30,13 @@ using OpenMetaverse;
 namespace OpenSim.Region.Framework.Interfaces
 {
     public delegate void ChangeDelegate(UUID regionID);
+    public delegate void MessageDelegate(UUID regionID, UUID fromID, string fromName, string message);
 
     public interface IEstateModule : IRegionModule
     {
         event ChangeDelegate OnRegionInfoChange;
         event ChangeDelegate OnEstateInfoChange;
+        event MessageDelegate OnEstateMessage;
 
         uint GetRegionFlags();
         bool IsManager(UUID avatarID);