From 8c631cfaa3af2397d325e9b440ef2b45f287471f Mon Sep 17 00:00:00 2001
From: Melanie Thielker <melanie@t-data.com>
Date: Sat, 17 Jul 2010 16:32:55 +0200
Subject: [PATCH] Allow communicating with blue box dialogs across a region
 border via a child agent

---
 .../CoreModules/Avatar/Dialog/DialogModule.cs     | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index b5c3176d8e..72fff948ed 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -81,14 +81,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
         {
             ScenePresence sp = m_scene.GetScenePresence(agentID);
             
-            if (sp != null && !sp.IsChildAgent)
+            if (sp != null)
                 sp.ControllingClient.SendAgentAlertMessage(message, modal);
         }
         
         public void SendAlertToUser(string firstName, string lastName, string message, bool modal)
         {
             ScenePresence presence = m_scene.GetScenePresence(firstName, lastName);
-            if (presence != null && !presence.IsChildAgent)
+            if (presence != null)
                 presence.ControllingClient.SendAgentAlertMessage(message, modal);
         }
         
@@ -96,8 +96,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
         {
             m_scene.ForEachScenePresence(delegate(ScenePresence presence)
             {
-                if (!presence.IsChildAgent)
-                    presence.ControllingClient.SendAlertMessage(message);
+                presence.ControllingClient.SendAlertMessage(message);
             });
         }
 
@@ -119,7 +118,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
             }
 
             ScenePresence sp = m_scene.GetScenePresence(avatarID);
-            if (sp != null && !sp.IsChildAgent)
+            if (sp != null)
                 sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels);
         }
 
@@ -128,7 +127,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
         {
             ScenePresence sp = m_scene.GetScenePresence(avatarID);
             
-            if (sp != null && !sp.IsChildAgent)
+            if (sp != null)
                 sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url);
         }
         
@@ -149,7 +148,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
 
             ScenePresence sp = m_scene.GetScenePresence(avatarid);
             
-            if (sp != null && !sp.IsChildAgent)
+            if (sp != null)
                 sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerFirstName, ownerLastName, objectid);
         }
 
@@ -205,4 +204,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
             return result;
         }
     }
-}
\ No newline at end of file
+}