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

1 files changed, 20 insertions, 4 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index ac89f52..369d480 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -248,16 +248,22 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             if (scene == null)
                 scene = m_SceneList[0];
 
-            SendReply reply = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, SendReply>(
-                    "POST", m_RestURL+"/SaveMessage/?scope=" +
-                    scene.RegionInfo.ScopeID.ToString(), im);
+// Avination new code
+//            SendReply reply = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, SendReply>(
+//                    "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)
             {
                 IClientAPI client = FindClient(new UUID(im.fromAgentID));
                 if (client == null)
                     return;
-
+/* Avination new code
                 if (reply.Message == String.Empty)
                     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,
                             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
             }
         }
     }