diff options
Diffstat (limited to '')
3 files changed, 18 insertions, 34 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs index 01717ce..038f5c1 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | |||
@@ -137,12 +137,14 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
137 | 137 | ||
138 | if ((client != null) && !success) | 138 | if ((client != null) && !success) |
139 | { | 139 | { |
140 | client.SendInstantMessage(new UUID(im.toAgentID), | 140 | client.SendInstantMessage( |
141 | "Unable to send instant message. "+ | 141 | new GridInstantMessage( |
142 | "User is not logged in.", | 142 | null, new UUID(im.fromAgentID), "System", |
143 | new UUID(im.fromAgentID), "System", | 143 | new UUID(im.toAgentID), |
144 | (byte)InstantMessageDialog.BusyAutoResponse, | 144 | (byte)InstantMessageDialog.BusyAutoResponse, |
145 | (uint)Util.UnixTimeSinceEpoch()); | 145 | "Unable to send instant message. "+ |
146 | "User is not logged in.", false, | ||
147 | new Vector3())); | ||
146 | } | 148 | } |
147 | } | 149 | } |
148 | ); | 150 | ); |
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; |
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs index 814b2de..9eb8e27 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | |||
@@ -167,11 +167,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
167 | { | 167 | { |
168 | DateTime saved = Util.ToDateTime((uint)im.timestamp); | 168 | DateTime saved = Util.ToDateTime((uint)im.timestamp); |
169 | 169 | ||
170 | client.SendInstantMessage(new UUID(im.toAgentID), | 170 | im.message = "(saved " + saved.ToString() + ") " + im.message; |
171 | "(saved " + saved.ToString() + ") " + im.message, | 171 | client.SendInstantMessage(im); |
172 | new UUID(im.fromAgentID), im.fromAgentName, | ||
173 | (byte)im.dialog, | ||
174 | (uint)im.timestamp); | ||
175 | } | 172 | } |
176 | } | 173 | } |
177 | 174 | ||
@@ -188,12 +185,13 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
188 | if (client == null) | 185 | if (client == null) |
189 | return; | 186 | return; |
190 | 187 | ||
191 | client.SendInstantMessage(new UUID(im.fromAgentID), | 188 | client.SendInstantMessage(new GridInstantMessage( |
189 | null, new UUID(im.toAgentID), | ||
190 | "System", new UUID(im.fromAgentID), | ||
191 | (byte)InstantMessageDialog.MessageFromAgent, | ||
192 | "User is not logged in. "+ | 192 | "User is not logged in. "+ |
193 | (success ? "Message saved." : "Message not saved"), | 193 | (success ? "Message saved." : "Message not saved"), |
194 | new UUID(im.toAgentID), "System", | 194 | false, new Vector3())); |
195 | (byte)InstantMessageDialog.MessageFromAgent, | ||
196 | (uint)Util.UnixTimeSinceEpoch()); | ||
197 | } | 195 | } |
198 | } | 196 | } |
199 | } | 197 | } |