From 385a6c4b344200ef183ce63edacec77fb18bcabc Mon Sep 17 00:00:00 2001 From: Melanie Date: Fri, 26 Nov 2010 23:20:43 +0100 Subject: [PATCH] Convert the scope id in the im session id to a URL variable. Fixes offline group notice attachments not working --- .../Avatar/InstantMessage/OfflineMessageModule.cs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs index d3db5b7a4f..164ae50761 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 im.offline = 1; - // Reconstruct imSessionID - if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent) - { - UUID fromAgentID = new UUID(im.fromAgentID); - UUID sessionID = fromAgentID ^ client.AgentId; - im.imSessionID = new Guid(sessionID.ToString()); - } - Scene s = FindScene(client.AgentId); if (s != null) s.EventManager.TriggerIncomingInstantMessage(im); @@ -226,10 +218,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage Scene scene = FindScene(new UUID(im.fromAgentID)); if (scene == null) scene = m_SceneList[0]; - im.imSessionID = new Guid(scene.RegionInfo.ScopeID.ToString()); bool success = SynchronousRestObjectPoster.BeginPostObject( - "POST", m_RestURL+"/SaveMessage/", im); + "POST", m_RestURL+"/SaveMessage/?scope=" + + scene.RegionInfo.ScopeID.ToString(), im); if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent) {