diff options
author | Melanie | 2011-12-07 00:43:59 +0100 |
---|---|---|
committer | Melanie | 2011-12-07 00:43:59 +0100 |
commit | d6486fe14a77b74235eaa9e1feab36f923dc6ee9 (patch) | |
tree | 7bcda14d72eeb74635cbb36cef13539137d945ba /OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |
parent | Remove harmless merge artefact (diff) | |
download | opensim-SC_OLD-d6486fe14a77b74235eaa9e1feab36f923dc6ee9.zip opensim-SC_OLD-d6486fe14a77b74235eaa9e1feab36f923dc6ee9.tar.gz opensim-SC_OLD-d6486fe14a77b74235eaa9e1feab36f923dc6ee9.tar.bz2 opensim-SC_OLD-d6486fe14a77b74235eaa9e1feab36f923dc6ee9.tar.xz |
Fix task inventory giving
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 712632b..6064ddc 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
@@ -146,20 +146,13 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
146 | ScenePresence sp = scene.GetScenePresence(toAgentID); | 146 | ScenePresence sp = scene.GetScenePresence(toAgentID); |
147 | if (sp != null && !sp.IsChildAgent) | 147 | if (sp != null && !sp.IsChildAgent) |
148 | { | 148 | { |
149 | // m_log.DebugFormat( | 149 | // Local message |
150 | // "[INSTANT MESSAGE]: Looking for root agent {0} in {1}", | 150 | // m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", user.Name, toAgentID); |
151 | // toAgentID.ToString(), scene.RegionInfo.RegionName); | 151 | sp.ControllingClient.SendInstantMessage(im); |
152 | |||
153 | ScenePresence user = (ScenePresence) scene.Entities[toAgentID]; | ||
154 | if (!user.IsChildAgent) | ||
155 | { | ||
156 | // m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client"); | ||
157 | user.ControllingClient.SendInstantMessage(im); | ||
158 | 152 | ||
159 | // Message sent | 153 | // Message sent |
160 | result(true); | 154 | result(true); |
161 | return; | 155 | return; |
162 | } | ||
163 | } | 156 | } |
164 | } | 157 | } |
165 | 158 | ||
@@ -172,10 +165,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
172 | if (sp != null) | 165 | if (sp != null) |
173 | { | 166 | { |
174 | // Local message | 167 | // Local message |
175 | ScenePresence user = (ScenePresence) scene.Entities[toAgentID]; | 168 | // m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to child agent {0} {1}", user.Name, toAgentID); |
176 | 169 | sp.ControllingClient.SendInstantMessage(im); | |
177 | // m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client"); | ||
178 | user.ControllingClient.SendInstantMessage(im); | ||
179 | 170 | ||
180 | // Message sent | 171 | // Message sent |
181 | result(true); | 172 | result(true); |