aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2009-10-06 15:29:46 +0100
committerMelanie2009-10-06 15:29:46 +0100
commit40d0018d66c0a16a4a47b3920c51aa822b4f5438 (patch)
tree81dc154bebb1fe1da945852b244ac16e43c9cdbc /OpenSim/Region/Framework
parentLock the heartbeat against multiple invocations. May prevent deadlocks and/or (diff)
parentCommenting the DEBUG code that I added yesterday, because it's causing mono t... (diff)
downloadopensim-SC_OLD-40d0018d66c0a16a4a47b3920c51aa822b4f5438.zip
opensim-SC_OLD-40d0018d66c0a16a4a47b3920c51aa822b4f5438.tar.gz
opensim-SC_OLD-40d0018d66c0a16a4a47b3920c51aa822b4f5438.tar.bz2
opensim-SC_OLD-40d0018d66c0a16a4a47b3920c51aa822b4f5438.tar.xz
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c863c3b..5f18a44 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -972,12 +972,12 @@ namespace OpenSim.Region.Framework.Scenes
972 int maintc = 0; 972 int maintc = 0;
973 while (!shuttingdown) 973 while (!shuttingdown)
974 { 974 {
975#if DEBUG 975//#if DEBUG
976 int w = 0, io = 0; 976// int w = 0, io = 0;
977 ThreadPool.GetAvailableThreads(out w, out io); 977// ThreadPool.GetAvailableThreads(out w, out io);
978 if ((w < 10) || (io < 10)) 978// if ((w < 10) || (io < 10))
979 m_log.DebugFormat("[WARNING]: ThreadPool reaching exhaustion. workers = {0}; io = {1}", w, io); 979// m_log.DebugFormat("[WARNING]: ThreadPool reaching exhaustion. workers = {0}; io = {1}", w, io);
980#endif 980//#endif
981 maintc = Environment.TickCount; 981 maintc = Environment.TickCount;
982 982
983 TimeSpan SinceLastFrame = DateTime.Now - m_lastupdate; 983 TimeSpan SinceLastFrame = DateTime.Now - m_lastupdate;