aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorubit2012-07-04 07:16:27 +0200
committerubit2012-07-04 07:16:27 +0200
commit47170ba7531dc9939916689089551cfbc6f96114 (patch)
tree0fc674d7ff03a589c49ec8a40ec65f1a37d8b85a /OpenSim/Framework/Servers
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent*test* slow http retries pool rate to original 1s (diff)
downloadopensim-SC_OLD-47170ba7531dc9939916689089551cfbc6f96114.zip
opensim-SC_OLD-47170ba7531dc9939916689089551cfbc6f96114.tar.gz
opensim-SC_OLD-47170ba7531dc9939916689089551cfbc6f96114.tar.bz2
opensim-SC_OLD-47170ba7531dc9939916689089551cfbc6f96114.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index e488b38..36f2b9b 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -232,7 +232,7 @@ namespace OpenSim.Framework.Servers.HttpServer
232 { 232 {
233 while (m_running) 233 while (m_running)
234 { 234 {
235 Thread.Sleep(100); // let the world move 235 Thread.Sleep(1000); // let the world move slow it to original polling rate
236 Watchdog.UpdateThread(); 236 Watchdog.UpdateThread();
237 lock (m_retry_requests) 237 lock (m_retry_requests)
238 { 238 {