diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs index de25048..b27b07d 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | |||
@@ -171,7 +171,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
171 | 171 | ||
172 | private void RetrieveInstantMessages(IClientAPI client) | 172 | private void RetrieveInstantMessages(IClientAPI client) |
173 | { | 173 | { |
174 | if (m_RestURL != "") | 174 | if (m_RestURL == String.Empty) |
175 | { | ||
176 | return; | ||
177 | } | ||
178 | else | ||
175 | { | 179 | { |
176 | m_log.DebugFormat("[OFFLINE MESSAGING]: Retrieving stored messages for {0}", client.AgentId); | 180 | m_log.DebugFormat("[OFFLINE MESSAGING]: Retrieving stored messages for {0}", client.AgentId); |
177 | 181 | ||
@@ -179,22 +183,25 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
179 | = SynchronousRestObjectRequester.MakeRequest<UUID, List<GridInstantMessage>>( | 183 | = SynchronousRestObjectRequester.MakeRequest<UUID, List<GridInstantMessage>>( |
180 | "POST", m_RestURL + "/RetrieveMessages/", client.AgentId); | 184 | "POST", m_RestURL + "/RetrieveMessages/", client.AgentId); |
181 | 185 | ||
182 | if (msglist == null) | 186 | if (msglist != null) |
183 | m_log.WarnFormat("[OFFLINE MESSAGING]: WARNING null message list."); | ||
184 | |||
185 | foreach (GridInstantMessage im in msglist) | ||
186 | { | 187 | { |
187 | // client.SendInstantMessage(im); | 188 | foreach (GridInstantMessage im in msglist) |
188 | 189 | { | |
189 | // Send through scene event manager so all modules get a chance | 190 | // client.SendInstantMessage(im); |
190 | // to look at this message before it gets delivered. | 191 | |
191 | // | 192 | // Send through scene event manager so all modules get a chance |
192 | // Needed for proper state management for stored group | 193 | // to look at this message before it gets delivered. |
193 | // invitations | 194 | // |
194 | // | 195 | // Needed for proper state management for stored group |
195 | Scene s = FindScene(client.AgentId); | 196 | // invitations |
196 | if (s != null) | 197 | // |
197 | s.EventManager.TriggerIncomingInstantMessage(im); | 198 | |
199 | im.offline = 1; | ||
200 | |||
201 | Scene s = FindScene(client.AgentId); | ||
202 | if (s != null) | ||
203 | s.EventManager.TriggerIncomingInstantMessage(im); | ||
204 | } | ||
198 | } | 205 | } |
199 | } | 206 | } |
200 | } | 207 | } |
@@ -205,24 +212,19 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
205 | im.dialog != (byte)InstantMessageDialog.MessageFromAgent && | 212 | im.dialog != (byte)InstantMessageDialog.MessageFromAgent && |
206 | im.dialog != (byte)InstantMessageDialog.GroupNotice && | 213 | im.dialog != (byte)InstantMessageDialog.GroupNotice && |
207 | im.dialog != (byte)InstantMessageDialog.GroupInvitation && | 214 | im.dialog != (byte)InstantMessageDialog.GroupInvitation && |
208 | im.dialog != (byte)InstantMessageDialog.InventoryOffered) | 215 | im.dialog != (byte)InstantMessageDialog.InventoryOffered && |
216 | im.dialog != (byte)InstantMessageDialog.TaskInventoryOffered) | ||
209 | { | 217 | { |
210 | return; | 218 | return; |
211 | } | 219 | } |
212 | 220 | ||
213 | if (!m_ForwardOfflineGroupMessages) | ||
214 | { | ||
215 | if (im.dialog == (byte)InstantMessageDialog.GroupNotice || | ||
216 | im.dialog != (byte)InstantMessageDialog.GroupInvitation) | ||
217 | return; | ||
218 | } | ||
219 | |||
220 | Scene scene = FindScene(new UUID(im.fromAgentID)); | 221 | Scene scene = FindScene(new UUID(im.fromAgentID)); |
221 | if (scene == null) | 222 | if (scene == null) |
222 | scene = m_SceneList[0]; | 223 | scene = m_SceneList[0]; |
223 | 224 | ||
224 | bool success = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>( | 225 | bool success = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>( |
225 | "POST", m_RestURL+"/SaveMessage/", im); | 226 | "POST", m_RestURL+"/SaveMessage/?scope=" + |
227 | scene.RegionInfo.ScopeID.ToString(), im); | ||
226 | 228 | ||
227 | if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent) | 229 | if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent) |
228 | { | 230 | { |