diff options
author | Justin Clark-Casey (justincc) | 2010-05-12 21:42:23 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-05-21 17:22:39 +0100 |
commit | 78a0fd52813d80a61af0d2ae4522fb757eb19d2b (patch) | |
tree | e4fce26592f7bdaf4e2f6e36e600b1ba6c5e69d6 /OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | |
parent | Change the way the object perms are propagated to attempt to salvage (diff) | |
download | opensim-SC_OLD-78a0fd52813d80a61af0d2ae4522fb757eb19d2b.zip opensim-SC_OLD-78a0fd52813d80a61af0d2ae4522fb757eb19d2b.tar.gz opensim-SC_OLD-78a0fd52813d80a61af0d2ae4522fb757eb19d2b.tar.bz2 opensim-SC_OLD-78a0fd52813d80a61af0d2ae4522fb757eb19d2b.tar.xz |
Only send dialogs and notices to root agents, not child agents
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs index da38ede..b5c3176 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) | 84 | if (sp != null && !sp.IsChildAgent) |
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) | 91 | if (presence != null && !presence.IsChildAgent) |
92 | presence.ControllingClient.SendAgentAlertMessage(message, modal); | 92 | presence.ControllingClient.SendAgentAlertMessage(message, modal); |
93 | } | 93 | } |
94 | 94 | ||
@@ -119,7 +119,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
119 | } | 119 | } |
120 | 120 | ||
121 | ScenePresence sp = m_scene.GetScenePresence(avatarID); | 121 | ScenePresence sp = m_scene.GetScenePresence(avatarID); |
122 | if (sp != null) | 122 | if (sp != null && !sp.IsChildAgent) |
123 | sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels); | 123 | sp.ControllingClient.SendDialog(objectName, objectID, ownerFirstName, ownerLastName, message, textureID, ch, buttonlabels); |
124 | } | 124 | } |
125 | 125 | ||
@@ -128,13 +128,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
128 | { | 128 | { |
129 | ScenePresence sp = m_scene.GetScenePresence(avatarID); | 129 | ScenePresence sp = m_scene.GetScenePresence(avatarID); |
130 | 130 | ||
131 | if (sp != null) | 131 | if (sp != null && !sp.IsChildAgent) |
132 | sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url); | 132 | sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url); |
133 | } | 133 | } |
134 | 134 | ||
135 | public void SendTextBoxToUser(UUID avatarid, string message, int chatChannel, string name, UUID objectid, UUID ownerid) | 135 | public void SendTextBoxToUser(UUID avatarid, string message, int chatChannel, string name, UUID objectid, UUID ownerid) |
136 | { | 136 | { |
137 | UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid); | 137 | UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid); |
138 | string ownerFirstName, ownerLastName; | 138 | string ownerFirstName, ownerLastName; |
139 | if (account != null) | 139 | if (account != null) |
140 | { | 140 | { |
@@ -147,12 +147,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
147 | ownerLastName = "user)"; | 147 | ownerLastName = "user)"; |
148 | } | 148 | } |
149 | 149 | ||
150 | |||
151 | ScenePresence sp = m_scene.GetScenePresence(avatarid); | 150 | ScenePresence sp = m_scene.GetScenePresence(avatarid); |
152 | 151 | ||
153 | if (sp != null) { | 152 | if (sp != null && !sp.IsChildAgent) |
154 | sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerFirstName, ownerLastName, objectid); | 153 | sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerFirstName, ownerLastName, objectid); |
155 | } | ||
156 | } | 154 | } |
157 | 155 | ||
158 | public void SendNotificationToUsersInRegion( | 156 | public void SendNotificationToUsersInRegion( |
@@ -207,4 +205,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog | |||
207 | return result; | 205 | return result; |
208 | } | 206 | } |
209 | } | 207 | } |
210 | } | 208 | } \ No newline at end of file |