aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorubit2012-10-28 15:34:54 +0100
committerubit2012-10-28 15:34:54 +0100
commit1bcecdaf30ee903a5e130aade79c974fd10ba80a (patch)
treedb4411916aa32a8327545b6ae55307dea57e11e6 /OpenSim
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent fix ode timing (diff)
downloadopensim-SC_OLD-1bcecdaf30ee903a5e130aade79c974fd10ba80a.zip
opensim-SC_OLD-1bcecdaf30ee903a5e130aade79c974fd10ba80a.tar.gz
opensim-SC_OLD-1bcecdaf30ee903a5e130aade79c974fd10ba80a.tar.bz2
opensim-SC_OLD-1bcecdaf30ee903a5e130aade79c974fd10ba80a.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index 0194c21..eb0a514 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -1692,7 +1692,6 @@ namespace OpenSim.Region.Physics.OdePlugin
1692 1692
1693 DateTime now = DateTime.UtcNow; 1693 DateTime now = DateTime.UtcNow;
1694 TimeSpan timedif = now - m_lastframe; 1694 TimeSpan timedif = now - m_lastframe;
1695 m_lastframe = now;
1696 timeStep = (float)timedif.TotalSeconds; 1695 timeStep = (float)timedif.TotalSeconds;
1697 1696
1698 // acumulate time so we can reduce error 1697 // acumulate time so we can reduce error
@@ -1704,6 +1703,8 @@ namespace OpenSim.Region.Physics.OdePlugin
1704 if (framecount < 0) 1703 if (framecount < 0)
1705 framecount = 0; 1704 framecount = 0;
1706 1705
1706 m_lastframe = now;
1707
1707 framecount++; 1708 framecount++;
1708 1709
1709 int curphysiteractions; 1710 int curphysiteractions;