OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove thread Heartbeat from watchdog

LSLKeyTest
UbitUmarov 2015-11-27 13:45:14 +00:00
parent 9224b5d680
commit c5395cef74
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -531,11 +531,11 @@ namespace OpenSim.Region.Framework.Scenes
// private int m_lastUpdate; // private int m_lastUpdate;
private bool m_firstHeartbeat = true; private bool m_firstHeartbeat = true;
private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time; // private UpdatePrioritizationSchemes m_priorityScheme = UpdatePrioritizationSchemes.Time;
private bool m_reprioritizationEnabled = true; // private bool m_reprioritizationEnabled = true;
private double m_reprioritizationInterval = 5000.0; // private double m_reprioritizationInterval = 5000.0;
private double m_rootReprioritizationDistance = 10.0; // private double m_rootReprioritizationDistance = 10.0;
private double m_childReprioritizationDistance = 20.0; // private double m_childReprioritizationDistance = 20.0;
private Timer m_mapGenerationTimer = new Timer(); private Timer m_mapGenerationTimer = new Timer();
@ -1628,6 +1628,8 @@ namespace OpenSim.Region.Framework.Scenes
Watchdog.GetCurrentThreadInfo().AlarmIfTimeout = true; Watchdog.GetCurrentThreadInfo().AlarmIfTimeout = true;
m_lastFrameTick = Util.EnvironmentTickCount(); m_lastFrameTick = Util.EnvironmentTickCount();
Update(-1); Update(-1);
Watchdog.RemoveThread();
} }
private void Maintenance() private void Maintenance()