aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTom2010-08-03 11:06:41 -0700
committerTom2010-08-03 11:06:41 -0700
commitf04d51378f864d2eb522678b3fb1e239f746bd35 (patch)
tree370c76667cee0a471add82bb8e59a592558868cb /OpenSim
parentLog the UUID of a prim that fails meshing and set the prim to phantom during (diff)
downloadopensim-SC_OLD-f04d51378f864d2eb522678b3fb1e239f746bd35.zip
opensim-SC_OLD-f04d51378f864d2eb522678b3fb1e239f746bd35.tar.gz
opensim-SC_OLD-f04d51378f864d2eb522678b3fb1e239f746bd35.tar.bz2
opensim-SC_OLD-f04d51378f864d2eb522678b3fb1e239f746bd35.tar.xz
Drop the RestClient timeout from 15 minutes to 30 seconds. This does not address the problem, but it will allow the regions to recover in the event that the remote server goes away.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/RestClient.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs
index 97b3b60..42c0b18 100644
--- a/OpenSim/Framework/Communications/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient.cs
@@ -363,7 +363,7 @@ namespace OpenSim.Framework.Communications
363 _request = (HttpWebRequest) WebRequest.Create(buildUri()); 363 _request = (HttpWebRequest) WebRequest.Create(buildUri());
364 _request.KeepAlive = false; 364 _request.KeepAlive = false;
365 _request.ContentType = "application/xml"; 365 _request.ContentType = "application/xml";
366 _request.Timeout = 900000; 366 _request.Timeout = 30000;
367 _request.Method = RequestMethod; 367 _request.Method = RequestMethod;
368 _asyncException = null; 368 _asyncException = null;
369 _request.ContentLength = src.Length; 369 _request.ContentLength = src.Length;