diff options
author | Dan Lake | 2011-07-20 15:01:32 -0700 |
---|---|---|
committer | Dan Lake | 2011-07-20 15:01:32 -0700 |
commit | 2c11f7fc38ba14e041ed0e648088d574dadaaffe (patch) | |
tree | d593e3d1130e78ec74a11650d413f451a9a844da /OpenSim/Services/HypergridService/HGInstantMessageService.cs | |
parent | Merge branch 'master' into bulletsim (diff) | |
parent | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts (diff) | |
download | opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.zip opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.gz opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.bz2 opensim-SC-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.xz |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Services/HypergridService/HGInstantMessageService.cs')
-rw-r--r-- | OpenSim/Services/HypergridService/HGInstantMessageService.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Services/HypergridService/HGInstantMessageService.cs b/OpenSim/Services/HypergridService/HGInstantMessageService.cs index ded589d..bb31fc9 100644 --- a/OpenSim/Services/HypergridService/HGInstantMessageService.cs +++ b/OpenSim/Services/HypergridService/HGInstantMessageService.cs | |||
@@ -326,7 +326,6 @@ namespace OpenSim.Services.HypergridService | |||
326 | // This is recursive!!!!! | 326 | // This is recursive!!!!! |
327 | return TrySendInstantMessage(im, url, false, foreigner); | 327 | return TrySendInstantMessage(im, url, false, foreigner); |
328 | } | 328 | } |
329 | |||
330 | } | 329 | } |
331 | 330 | ||
332 | private bool UndeliveredMessage(GridInstantMessage im) | 331 | private bool UndeliveredMessage(GridInstantMessage im) |
@@ -335,15 +334,14 @@ namespace OpenSim.Services.HypergridService | |||
335 | && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages))) | 334 | && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages))) |
336 | { | 335 | { |
337 | m_log.DebugFormat("[HG IM SERVICE]: Message saved"); | 336 | m_log.DebugFormat("[HG IM SERVICE]: Message saved"); |
338 | return SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>( | ||
339 | "POST", m_RestURL + "/SaveMessage/", im); | ||
340 | 337 | ||
338 | return SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>( | ||
339 | "POST", m_RestURL + "/SaveMessage/", im); | ||
341 | } | 340 | } |
342 | |||
343 | else | 341 | else |
344 | { | 342 | { |
345 | return false; | 343 | return false; |
346 | } | 344 | } |
347 | } | 345 | } |
348 | } | 346 | } |
349 | } | 347 | } \ No newline at end of file |