diff options
-rw-r--r-- | OpenSim/Framework/Watchdog.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneViewer.cs | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Framework/Watchdog.cs b/OpenSim/Framework/Watchdog.cs index 9baf3a0..3389ecb 100644 --- a/OpenSim/Framework/Watchdog.cs +++ b/OpenSim/Framework/Watchdog.cs | |||
@@ -127,7 +127,7 @@ namespace OpenSim.Framework | |||
127 | m_threads.Add(threadInfo.Thread.ManagedThreadId, threadInfo); | 127 | m_threads.Add(threadInfo.Thread.ManagedThreadId, threadInfo); |
128 | } | 128 | } |
129 | 129 | ||
130 | private static bool RemoveThread(int threadID) | 130 | public static bool RemoveThread(int threadID) |
131 | { | 131 | { |
132 | lock (m_threads) | 132 | lock (m_threads) |
133 | return m_threads.Remove(threadID); | 133 | return m_threads.Remove(threadID); |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index d915807..deeb817 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1093,6 +1093,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1093 | { | 1093 | { |
1094 | m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName); | 1094 | m_log.ErrorFormat("[SCENE]: Restarting heartbeat thread because it hasn't reported in in region {0}", RegionInfo.RegionName); |
1095 | HeartbeatThread.Abort(); | 1095 | HeartbeatThread.Abort(); |
1096 | Watchdog.RemoveThread(HeartbeatThread.ManagedThreadId); | ||
1096 | HeartbeatThread = null; | 1097 | HeartbeatThread = null; |
1097 | } | 1098 | } |
1098 | m_lastUpdate = Util.EnvironmentTickCount(); | 1099 | m_lastUpdate = Util.EnvironmentTickCount(); |
@@ -4801,7 +4802,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4801 | if (m_firstHeartbeat) | 4802 | if (m_firstHeartbeat) |
4802 | return; | 4803 | return; |
4803 | 4804 | ||
4804 | if (Util.EnvironmentTickCountSubtract(m_lastUpdate) > 2000) | 4805 | if (Util.EnvironmentTickCountSubtract(m_lastUpdate) > 10000) |
4805 | StartTimer(); | 4806 | StartTimer(); |
4806 | } | 4807 | } |
4807 | 4808 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs index b44a010..40a73a9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs +++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs | |||
@@ -106,7 +106,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
106 | g.ScheduleFullUpdateToAvatar(m_presence); | 106 | g.ScheduleFullUpdateToAvatar(m_presence); |
107 | } | 107 | } |
108 | 108 | ||
109 | while (m_partsUpdateQueue.Count > 0) | 109 | while (m_partsUpdateQueue.Count != null && m_partsUpdateQueue.Count > 0) |
110 | { | 110 | { |
111 | SceneObjectPart part = m_partsUpdateQueue.Dequeue(); | 111 | SceneObjectPart part = m_partsUpdateQueue.Dequeue(); |
112 | 112 | ||