diff options
Diffstat (limited to 'OpenSim/Services/HypergridService')
-rw-r--r-- | OpenSim/Services/HypergridService/HGInstantMessageService.cs | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/OpenSim/Services/HypergridService/HGInstantMessageService.cs b/OpenSim/Services/HypergridService/HGInstantMessageService.cs index ded589d..0c9cfd3 100644 --- a/OpenSim/Services/HypergridService/HGInstantMessageService.cs +++ b/OpenSim/Services/HypergridService/HGInstantMessageService.cs | |||
@@ -95,7 +95,6 @@ namespace OpenSim.Services.HypergridService | |||
95 | m_InGatekeeper = serverConfig.GetBoolean("InGatekeeper", false); | 95 | m_InGatekeeper = serverConfig.GetBoolean("InGatekeeper", false); |
96 | m_log.DebugFormat("[HG IM SERVICE]: Starting... InRobust? {0}", m_InGatekeeper); | 96 | m_log.DebugFormat("[HG IM SERVICE]: Starting... InRobust? {0}", m_InGatekeeper); |
97 | 97 | ||
98 | |||
99 | if (gridService == string.Empty || presenceService == string.Empty) | 98 | if (gridService == string.Empty || presenceService == string.Empty) |
100 | throw new Exception(String.Format("Incomplete specifications, InstantMessage Service cannot function.")); | 99 | throw new Exception(String.Format("Incomplete specifications, InstantMessage Service cannot function.")); |
101 | 100 | ||
@@ -120,8 +119,8 @@ namespace OpenSim.Services.HypergridService | |||
120 | 119 | ||
121 | public bool IncomingInstantMessage(GridInstantMessage im) | 120 | public bool IncomingInstantMessage(GridInstantMessage im) |
122 | { | 121 | { |
123 | m_log.DebugFormat("[HG IM SERVICE]: Received message from {0} to {1}", im.fromAgentID, im.toAgentID); | 122 | // m_log.DebugFormat("[HG IM SERVICE]: Received message from {0} to {1}", im.fromAgentID, im.toAgentID); |
124 | UUID toAgentID = new UUID(im.toAgentID); | 123 | // UUID toAgentID = new UUID(im.toAgentID); |
125 | 124 | ||
126 | bool success = false; | 125 | bool success = false; |
127 | if (m_IMSimConnector != null) | 126 | if (m_IMSimConnector != null) |
@@ -142,7 +141,7 @@ namespace OpenSim.Services.HypergridService | |||
142 | 141 | ||
143 | public bool OutgoingInstantMessage(GridInstantMessage im, string url, bool foreigner) | 142 | public bool OutgoingInstantMessage(GridInstantMessage im, string url, bool foreigner) |
144 | { | 143 | { |
145 | m_log.DebugFormat("[HG IM SERVICE]: Sending message from {0} to {1}@{2}", im.fromAgentID, im.toAgentID, url); | 144 | // m_log.DebugFormat("[HG IM SERVICE]: Sending message from {0} to {1}@{2}", im.fromAgentID, im.toAgentID, url); |
146 | if (url != string.Empty) | 145 | if (url != string.Empty) |
147 | return TrySendInstantMessage(im, url, true, foreigner); | 146 | return TrySendInstantMessage(im, url, true, foreigner); |
148 | else | 147 | else |
@@ -326,7 +325,6 @@ namespace OpenSim.Services.HypergridService | |||
326 | // This is recursive!!!!! | 325 | // This is recursive!!!!! |
327 | return TrySendInstantMessage(im, url, false, foreigner); | 326 | return TrySendInstantMessage(im, url, false, foreigner); |
328 | } | 327 | } |
329 | |||
330 | } | 328 | } |
331 | 329 | ||
332 | private bool UndeliveredMessage(GridInstantMessage im) | 330 | private bool UndeliveredMessage(GridInstantMessage im) |
@@ -334,16 +332,15 @@ namespace OpenSim.Services.HypergridService | |||
334 | if (m_RestURL != string.Empty && (im.offline != 0) | 332 | if (m_RestURL != string.Empty && (im.offline != 0) |
335 | && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages))) | 333 | && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages))) |
336 | { | 334 | { |
337 | m_log.DebugFormat("[HG IM SERVICE]: Message saved"); | 335 | // m_log.DebugFormat("[HG IM SERVICE]: Message saved"); |
338 | return SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>( | ||
339 | "POST", m_RestURL + "/SaveMessage/", im); | ||
340 | 336 | ||
337 | return SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>( | ||
338 | "POST", m_RestURL + "/SaveMessage/", im); | ||
341 | } | 339 | } |
342 | |||
343 | else | 340 | else |
344 | { | 341 | { |
345 | return false; | 342 | return false; |
346 | } | 343 | } |
347 | } | 344 | } |
348 | } | 345 | } |
349 | } | 346 | } \ No newline at end of file |