aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-02-24 05:02:33 +0000
committerJustin Clark-Casey (justincc)2012-02-24 05:02:33 +0000
commitf67f37074f3f7e0602b66aa66a044dd9fd107f6a (patch)
treef4e592451ab205b23075d423dab1a2a94dee5629 /OpenSim/Framework/Servers
parentIn osSetSpeed(), if no avatar for a uuid is found then don't attempt to set s... (diff)
downloadopensim-SC_OLD-f67f37074f3f7e0602b66aa66a044dd9fd107f6a.zip
opensim-SC_OLD-f67f37074f3f7e0602b66aa66a044dd9fd107f6a.tar.gz
opensim-SC_OLD-f67f37074f3f7e0602b66aa66a044dd9fd107f6a.tar.bz2
opensim-SC_OLD-f67f37074f3f7e0602b66aa66a044dd9fd107f6a.tar.xz
Stop spurious scene loop startup timeout alarms for scenes with many prims.
On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index 2206feb..0062d4e 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -65,6 +65,7 @@ namespace OpenSim.Framework.Servers.HttpServer
65 String.Format("PollServiceWorkerThread{0}", i), 65 String.Format("PollServiceWorkerThread{0}", i),
66 ThreadPriority.Normal, 66 ThreadPriority.Normal,
67 false, 67 false,
68 true,
68 int.MaxValue); 69 int.MaxValue);
69 } 70 }
70 71
@@ -73,6 +74,7 @@ namespace OpenSim.Framework.Servers.HttpServer
73 "PollServiceWatcherThread", 74 "PollServiceWatcherThread",
74 ThreadPriority.Normal, 75 ThreadPriority.Normal,
75 false, 76 false,
77 true,
76 1000 * 60 * 10); 78 1000 * 60 * 10);
77 } 79 }
78 80