OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Activate the new Offline IM module code instead of the old code 

As most have gone to OfflineMessaging V2, this change will not affect
existing users but will benefit future grids.
melanie
Melanie Thielker 2017-01-23 01:18:27 +00:00
parent 568614af2c
commit 1e0ed50d29
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
View File

@ -248,22 +248,16 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
if (scene == null) if (scene == null)
scene = m_SceneList[0]; scene = m_SceneList[0];
// Avination new code SendReply reply = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, SendReply>(
// SendReply reply = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, SendReply>( "POST", m_RestURL+"/SaveMessage/?scope=" +
// "POST", m_RestURL+"/SaveMessage/?scope=" + scene.RegionInfo.ScopeID.ToString(), im);
// scene.RegionInfo.ScopeID.ToString(), im);
// current opensim and osgrid compatible
bool success = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>(
"POST", m_RestURL+"/SaveMessage/", im, 10000);
// current opensim and osgrid compatible end
if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent) if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
{ {
IClientAPI client = FindClient(new UUID(im.fromAgentID)); IClientAPI client = FindClient(new UUID(im.fromAgentID));
if (client == null) if (client == null)
return; return;
/* Avination new code
if (reply.Message == String.Empty) if (reply.Message == String.Empty)
reply.Message = "User is not logged in. " + (reply.Success ? "Message saved." : "Message not saved"); reply.Message = "User is not logged in. " + (reply.Success ? "Message saved." : "Message not saved");
@ -296,16 +290,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
reply.Message, reply.Message,
false, new Vector3())); false, new Vector3()));
} }
*/
// current opensim and osgrid compatible
client.SendInstantMessage(new GridInstantMessage(
null, new UUID(im.toAgentID),
"System", new UUID(im.fromAgentID),
(byte)InstantMessageDialog.MessageFromAgent,
"User is not logged in. "+
(success ? "Message saved." : "Message not saved"),
false, new Vector3()));
// current opensim and osgrid compatible end
} }
} }
} }