diff options
author | ubit | 2012-10-28 15:42:51 +0100 |
---|---|---|
committer | ubit | 2012-10-28 15:42:51 +0100 |
commit | 707fa2bdb97b186de9878ee2c4aa14747c288fcd (patch) | |
tree | 14f723c4ca444a58ea99296cc32064bfd05170f5 | |
parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
parent | revert last change (diff) | |
download | opensim-SC-707fa2bdb97b186de9878ee2c4aa14747c288fcd.zip opensim-SC-707fa2bdb97b186de9878ee2c4aa14747c288fcd.tar.gz opensim-SC-707fa2bdb97b186de9878ee2c4aa14747c288fcd.tar.bz2 opensim-SC-707fa2bdb97b186de9878ee2c4aa14747c288fcd.tar.xz |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index eb0a514..54bc29f 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
@@ -1689,10 +1689,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1689 | /// <returns></returns> | 1689 | /// <returns></returns> |
1690 | public override float Simulate(float timeStep) | 1690 | public override float Simulate(float timeStep) |
1691 | { | 1691 | { |
1692 | |||
1693 | DateTime now = DateTime.UtcNow; | 1692 | DateTime now = DateTime.UtcNow; |
1694 | TimeSpan timedif = now - m_lastframe; | 1693 | TimeSpan timedif = now - m_lastframe; |
1695 | timeStep = (float)timedif.TotalSeconds; | 1694 | timeStep = (float)timedif.TotalSeconds; |
1695 | m_lastframe = now; | ||
1696 | 1696 | ||
1697 | // acumulate time so we can reduce error | 1697 | // acumulate time so we can reduce error |
1698 | step_time += timeStep; | 1698 | step_time += timeStep; |
@@ -1703,7 +1703,6 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1703 | if (framecount < 0) | 1703 | if (framecount < 0) |
1704 | framecount = 0; | 1704 | framecount = 0; |
1705 | 1705 | ||
1706 | m_lastframe = now; | ||
1707 | 1706 | ||
1708 | framecount++; | 1707 | framecount++; |
1709 | 1708 | ||