diff options
author | Melanie Thielker | 2010-07-17 16:32:55 +0200 |
---|---|---|
committer | Diva Canto | 2010-07-20 15:06:57 -0700 |
commit | 8c631cfaa3af2397d325e9b440ef2b45f287471f (patch) | |
tree | 6de906832a90fe0cccd08e89416969bebeb06119 /OpenSim/Region | |
parent | Restore lines that have been removed due to previous merge conflict. (diff) | |
download | opensim-SC_OLD-8c631cfaa3af2397d325e9b440ef2b45f287471f.zip opensim-SC_OLD-8c631cfaa3af2397d325e9b440ef2b45f287471f.tar.gz opensim-SC_OLD-8c631cfaa3af2397d325e9b440ef2b45f287471f.tar.bz2 opensim-SC_OLD-8c631cfaa3af2397d325e9b440ef2b45f287471f.tar.xz |
Allow communicating with blue box dialogs across a region border via a
child agent
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | 15 |
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 b5c3176..72fff94 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 | |||
81 | { | 81 | { |
82 | ScenePresence sp = m_scene.GetScenePresence(agentID); | 82 | ScenePresence sp = m_scene.GetScenePresence(agentID); |
83 | 83 | ||
84 | if (sp != null && !sp.IsChildAgent) | 84 | if (sp != null) |
85 | sp.ControllingClient.SendAgentAlertMessage(message, modal); | 85 | sp.ControllingClient.SendAgentAlertMessage(message, modal); |
86 | } | 86 | } |
87 | 87 | ||
88 | public void SendAlertToUser(string firstName, string lastName, string message, bool modal) | 88 | public void SendAlertToUser(string firstName, string lastName, string message, bool modal) |
89 | { | 89 | { |
90 | ScenePresence presence = m_scene.GetScenePresence(firstName, lastName); | 90 | ScenePresence presence = m_scene.GetScenePresence(firstName, lastName); |
91 | if (presence != null && !presence.IsChildAgent) | 91 | if (presence != null) |
92 | presence.ControllingClient.SendAgentAlertMessage(message, modal); | 92 | presence.ControllingClient.SendAgentAlertMessage(message, modal); |
93 | } | 93 | } |
94 | 94 | ||
@@ -96,8 +96,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
96 | { | 96 | { |
97 | m_scene.ForEachScenePresence(delegate(ScenePresence presence) | 97 | m_scene.ForEachScenePresence(delegate(ScenePresence presence) |
98 | { | 98 | { |
99 | if (!presence.IsChildAgent) | 99 | presence.ControllingClient.SendAlertMessage(message); |
100 | presence.ControllingClient.SendAlertMessage(message); | ||
101 | }); | 100 | }); |
102 | } | 101 | } |
103 | 102 | ||
@@ -119,7 +118,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
119 | } | 118 | } |
120 | 119 | ||
121 | ScenePresence sp = m_scene.GetScenePresence(avatarID); | 120 | ScenePresence sp = m_scene.GetScenePresence(avatarID); |
122 | if (sp != null && !sp.IsChildAgent) | 121 | if (sp != null) |
123 | sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels); | 122 | sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels); |
124 | } | 123 | } |
125 | 124 | ||
@@ -128,7 +127,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
128 | { | 127 | { |
129 | ScenePresence sp = m_scene.GetScenePresence(avatarID); | 128 | ScenePresence sp = m_scene.GetScenePresence(avatarID); |
130 | 129 | ||
131 | if (sp != null && !sp.IsChildAgent) | 130 | if (sp != null) |
132 | sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url); | 131 | sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url); |
133 | } | 132 | } |
134 | 133 | ||
@@ -149,7 +148,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
149 | 148 | ||
150 | ScenePresence sp = m_scene.GetScenePresence(avatarid); | 149 | ScenePresence sp = m_scene.GetScenePresence(avatarid); |
151 | 150 | ||
152 | if (sp != null && !sp.IsChildAgent) | 151 | if (sp != null) |
153 | sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerFirstName, ownerLastName, objectid); | 152 | sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerFirstName, ownerLastName, objectid); |
154 | } | 153 | } |
155 | 154 | ||
@@ -205,4 +204,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
205 | return result; | 204 | return result; |
206 | } | 205 | } |
207 | } | 206 | } |
208 | } \ No newline at end of file | 207 | } |