Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-10-28 15:34:54 +01:00
commit 1bcecdaf30
1 changed files with 2 additions and 1 deletions

View File

@ -1692,7 +1692,6 @@ namespace OpenSim.Region.Physics.OdePlugin
DateTime now = DateTime.UtcNow;
TimeSpan timedif = now - m_lastframe;
m_lastframe = now;
timeStep = (float)timedif.TotalSeconds;
// acumulate time so we can reduce error
@ -1704,6 +1703,8 @@ namespace OpenSim.Region.Physics.OdePlugin
if (framecount < 0)
framecount = 0;
m_lastframe = now;
framecount++;
int curphysiteractions;