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

change OfflineMessageModule from new avination code to original master, for compatibility with current web servers php scripts. This may change after current test phase

avinationmerge
UbitUmarov 2015-11-06 05:18:54 +00:00
parent f8efd00775
commit 527ea37540
1 changed files with 20 additions and 4 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,16 +248,22 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
if (scene == null) if (scene == null)
scene = m_SceneList[0]; scene = m_SceneList[0];
SendReply reply = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, SendReply>( // Avination new code
"POST", m_RestURL+"/SaveMessage/?scope=" + // SendReply reply = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, SendReply>(
scene.RegionInfo.ScopeID.ToString(), im); // "POST", m_RestURL+"/SaveMessage/?scope=" +
// 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");
@ -290,6 +296,16 @@ 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
} }
} }
} }