aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs15
1 files changed, 7 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index 4e36c5d..fb0bd1a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -86,14 +86,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
86 { 86 {
87 ScenePresence sp = m_scene.GetScenePresence(agentID); 87 ScenePresence sp = m_scene.GetScenePresence(agentID);
88 88
89 if (sp != null && !sp.IsChildAgent) 89 if (sp != null)
90 sp.ControllingClient.SendAgentAlertMessage(message, modal); 90 sp.ControllingClient.SendAgentAlertMessage(message, modal);
91 } 91 }
92 92
93 public void SendAlertToUser(string firstName, string lastName, string message, bool modal) 93 public void SendAlertToUser(string firstName, string lastName, string message, bool modal)
94 { 94 {
95 ScenePresence presence = m_scene.GetScenePresence(firstName, lastName); 95 ScenePresence presence = m_scene.GetScenePresence(firstName, lastName);
96 if (presence != null && !presence.IsChildAgent) 96 if (presence != null)
97 presence.ControllingClient.SendAgentAlertMessage(message, modal); 97 presence.ControllingClient.SendAgentAlertMessage(message, modal);
98 } 98 }
99 99
@@ -101,8 +101,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
101 { 101 {
102 m_scene.ForEachScenePresence(delegate(ScenePresence presence) 102 m_scene.ForEachScenePresence(delegate(ScenePresence presence)
103 { 103 {
104 if (!presence.IsChildAgent) 104 presence.ControllingClient.SendAlertMessage(message);
105 presence.ControllingClient.SendAlertMessage(message);
106 }); 105 });
107 } 106 }
108 107
@@ -124,7 +123,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
124 } 123 }
125 124
126 ScenePresence sp = m_scene.GetScenePresence(avatarID); 125 ScenePresence sp = m_scene.GetScenePresence(avatarID);
127 if (sp != null && !sp.IsChildAgent) 126 if (sp != null)
128 sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels); 127 sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels);
129 } 128 }
130 129
@@ -133,7 +132,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
133 { 132 {
134 ScenePresence sp = m_scene.GetScenePresence(avatarID); 133 ScenePresence sp = m_scene.GetScenePresence(avatarID);
135 134
136 if (sp != null && !sp.IsChildAgent) 135 if (sp != null)
137 sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url); 136 sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url);
138 } 137 }
139 138
@@ -154,7 +153,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
154 153
155 ScenePresence sp = m_scene.GetScenePresence(avatarid); 154 ScenePresence sp = m_scene.GetScenePresence(avatarid);
156 155
157 if (sp != null && !sp.IsChildAgent) 156 if (sp != null)
158 sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerFirstName, ownerLastName, objectid); 157 sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerFirstName, ownerLastName, objectid);
159 } 158 }
160 159
@@ -218,4 +217,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
218 return result; 217 return result;
219 } 218 }
220 } 219 }
221} \ No newline at end of file 220}