diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index d8d6219..23aaabe 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
@@ -113,16 +113,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
113 | if (!user.IsChildAgent) | 113 | if (!user.IsChildAgent) |
114 | { | 114 | { |
115 | m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client"); | 115 | m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client"); |
116 | user.ControllingClient.SendInstantMessage( | 116 | user.ControllingClient.SendInstantMessage(im); |
117 | new UUID(im.fromAgentID), | 117 | |
118 | im.message, | ||
119 | new UUID(im.toAgentID), | ||
120 | im.fromAgentName, | ||
121 | im.dialog, | ||
122 | im.timestamp, | ||
123 | new UUID(im.imSessionID), | ||
124 | im.fromGroup, | ||
125 | im.binaryBucket); | ||
126 | // Message sent | 118 | // Message sent |
127 | result(true); | 119 | result(true); |
128 | return; | 120 | return; |
@@ -143,16 +135,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
143 | ScenePresence user = (ScenePresence) scene.Entities[toAgentID]; | 135 | ScenePresence user = (ScenePresence) scene.Entities[toAgentID]; |
144 | 136 | ||
145 | m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client"); | 137 | m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client"); |
146 | user.ControllingClient.SendInstantMessage( | 138 | user.ControllingClient.SendInstantMessage(im); |
147 | new UUID(im.fromAgentID), | 139 | |
148 | im.message, | ||
149 | new UUID(im.toAgentID), | ||
150 | im.fromAgentName, | ||
151 | im.dialog, | ||
152 | im.timestamp, | ||
153 | new UUID(im.imSessionID), | ||
154 | im.fromGroup, | ||
155 | im.binaryBucket); | ||
156 | // Message sent | 140 | // Message sent |
157 | result(true); | 141 | result(true); |
158 | return; | 142 | return; |