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

Merge branch 'master' into ghosts

ghosts
Justin Clark-Casey (justincc) 2014-08-26 18:52:50 +01:00
parent 693bfdc0fb b1ff78f4d8
commit 6520065625
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1443,8 +1443,15 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
private volatile bool m_isTimerUpdateRunning;
private void Update(object sender, ElapsedEventArgs e) private void Update(object sender, ElapsedEventArgs e)
{ {
if (m_isTimerUpdateRunning)
return;
m_isTimerUpdateRunning = true;
// If the last frame did not complete on time, then immediately start the next update on the same thread // If the last frame did not complete on time, then immediately start the next update on the same thread
// and ignore further timed updates until we have a frame that had spare time. // and ignore further timed updates until we have a frame that had spare time.
while (!Update(1) && Active) {} while (!Update(1) && Active) {}
@ -1455,6 +1462,8 @@ namespace OpenSim.Region.Framework.Scenes
m_sceneUpdateTimer = null; m_sceneUpdateTimer = null;
m_isRunning = false; m_isRunning = false;
} }
m_isTimerUpdateRunning = false;
} }
private void Maintenance() private void Maintenance()