diff options
Convert the scope id in the im session id to a URL variable. Fixes offline
group notice attachments not working
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs index d3db5b7..164ae50 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | |||
@@ -195,14 +195,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
195 | 195 | ||
196 | im.offline = 1; | 196 | im.offline = 1; |
197 | 197 | ||
198 | // Reconstruct imSessionID | ||
199 | if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent) | ||
200 | { | ||
201 | UUID fromAgentID = new UUID(im.fromAgentID); | ||
202 | UUID sessionID = fromAgentID ^ client.AgentId; | ||
203 | im.imSessionID = new Guid(sessionID.ToString()); | ||
204 | } | ||
205 | |||
206 | Scene s = FindScene(client.AgentId); | 198 | Scene s = FindScene(client.AgentId); |
207 | if (s != null) | 199 | if (s != null) |
208 | s.EventManager.TriggerIncomingInstantMessage(im); | 200 | s.EventManager.TriggerIncomingInstantMessage(im); |
@@ -226,10 +218,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
226 | Scene scene = FindScene(new UUID(im.fromAgentID)); | 218 | Scene scene = FindScene(new UUID(im.fromAgentID)); |
227 | if (scene == null) | 219 | if (scene == null) |
228 | scene = m_SceneList[0]; | 220 | scene = m_SceneList[0]; |
229 | im.imSessionID = new Guid(scene.RegionInfo.ScopeID.ToString()); | ||
230 | 221 | ||
231 | bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>( | 222 | bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>( |
232 | "POST", m_RestURL+"/SaveMessage/", im); | 223 | "POST", m_RestURL+"/SaveMessage/?scope=" + |
224 | scene.RegionInfo.ScopeID.ToString(), im); | ||
233 | 225 | ||
234 | if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent) | 226 | if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent) |
235 | { | 227 | { |