diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs index 72ec869..6a9a962 100644 --- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | |||
@@ -79,7 +79,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
79 | { | 79 | { |
80 | ScenePresence sp = m_scene.GetScenePresence(agentID); | 80 | ScenePresence sp = m_scene.GetScenePresence(agentID); |
81 | 81 | ||
82 | if (sp != null) | 82 | if (sp != null && !sp.IsChildAgent) |
83 | sp.ControllingClient.SendAgentAlertMessage(message, modal); | 83 | sp.ControllingClient.SendAgentAlertMessage(message, modal); |
84 | } | 84 | } |
85 | 85 | ||
@@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
91 | { | 91 | { |
92 | ScenePresence presence = presenceList[i]; | 92 | ScenePresence presence = presenceList[i]; |
93 | 93 | ||
94 | if (presence.Firstname == firstName && presence.Lastname == lastName) | 94 | if (!presence.IsChildAgent && presence.Firstname == firstName && presence.Lastname == lastName) |
95 | { | 95 | { |
96 | presence.ControllingClient.SendAgentAlertMessage(message, modal); | 96 | presence.ControllingClient.SendAgentAlertMessage(message, modal); |
97 | break; | 97 | break; |
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
130 | } | 130 | } |
131 | 131 | ||
132 | ScenePresence sp = m_scene.GetScenePresence(avatarID); | 132 | ScenePresence sp = m_scene.GetScenePresence(avatarID); |
133 | if (sp != null) | 133 | if (sp != null && !sp.IsChildAgent) |
134 | sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels); | 134 | sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels); |
135 | } | 135 | } |
136 | 136 | ||
@@ -139,7 +139,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
139 | { | 139 | { |
140 | ScenePresence sp = m_scene.GetScenePresence(avatarID); | 140 | ScenePresence sp = m_scene.GetScenePresence(avatarID); |
141 | 141 | ||
142 | if (sp != null) | 142 | if (sp != null && !sp.IsChildAgent) |
143 | sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url); | 143 | sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url); |
144 | } | 144 | } |
145 | 145 | ||
@@ -206,4 +206,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
206 | return result; | 206 | return result; |
207 | } | 207 | } |
208 | } | 208 | } |
209 | } | 209 | } \ No newline at end of file |