aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-05-12 23:42:47 +0100
committerJustin Clark-Casey (justincc)2014-05-12 23:42:47 +0100
commit8ad29fc5c831fb5e02acaf140cb7fb7a7f5b1f08 (patch)
tree2beafe5da1ec64699c9d9cf6c2cae061f5290e08
parentFor XmlRpcGroups (Flotsam) module, when MessageOnlineUsersOnly = true, handle... (diff)
downloadopensim-SC_OLD-8ad29fc5c831fb5e02acaf140cb7fb7a7f5b1f08.zip
opensim-SC_OLD-8ad29fc5c831fb5e02acaf140cb7fb7a7f5b1f08.tar.gz
opensim-SC_OLD-8ad29fc5c831fb5e02acaf140cb7fb7a7f5b1f08.tar.bz2
opensim-SC_OLD-8ad29fc5c831fb5e02acaf140cb7fb7a7f5b1f08.tar.xz
Make offline IM delivery to URL (pre recent Addons code) have a 10 second rather than infinite timeout.
This both signals a problem with the URL and eventually frees the thread, rather than hanging indefinitely with no information.
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index bd2b2fe..c75920d 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -227,7 +227,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
227 } 227 }
228 228
229 bool success = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>( 229 bool success = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>(
230 "POST", m_RestURL+"/SaveMessage/", im); 230 "POST", m_RestURL+"/SaveMessage/", im, 10000);
231 231
232 if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent) 232 if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)
233 { 233 {