2 files changed, 17 insertions, 4 deletions

diff --git a/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs
index b64ec71..014c536 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Dialog/DialogModule.cs
@@ -99,7 +99,15 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Dialog
                 if (!presence.IsChildAgent)
                     presence.ControllingClient.SendAlertMessage(message);
             }
-        }      
+        }    
+        
+        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 SendNotificationToUsersInRegion(
             UUID fromAvatarID, string fromAvatarName, string message)
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
             }
         }
 
-        private void SendSimulatorBlueBoxMessage(IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message)
+        private void SendSimulatorBlueBoxMessage(
+            IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message)
         {
             IDialogModule dm = m_scene.RequestModuleInterface<IDialogModule>();
             
@@ -360,9 +361,13 @@ namespace OpenSim.Region.Environment.Modules.World.Estate
                 dm.SendNotificationToUsersInRegion(senderID, senderName, message);
         }
 
-        private void SendEstateBlueBoxMessage(IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message)
+        private void SendEstateBlueBoxMessage(
+            IClientAPI remote_client, UUID invoice, UUID senderID, UUID sessionID, string senderName, string message)
         {
-            m_scene.SendEstateMessageFromEstateTools(senderID, sessionID, senderName, message);
+            IDialogModule dm = m_scene.RequestModuleInterface<IDialogModule>();
+            
+            if (dm != null)
+                dm.SendNotificationToUsersInEstate(senderID, senderName, message);
         }
 
         private void handleEstateDebugRegionRequest(IClientAPI remote_client, UUID invoice, UUID senderID, bool scripted, bool collisionEvents, bool physics)