aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorubit2012-10-28 15:05:39 +0100
committerubit2012-10-28 15:05:39 +0100
commitc513a3db5945ef059b0aa32a8bccee71ee2df661 (patch)
treed13b41658e90a1f2938c10f5783453275e7fd146 /OpenSim
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentminor change (diff)
downloadopensim-SC_OLD-c513a3db5945ef059b0aa32a8bccee71ee2df661.zip
opensim-SC_OLD-c513a3db5945ef059b0aa32a8bccee71ee2df661.tar.gz
opensim-SC_OLD-c513a3db5945ef059b0aa32a8bccee71ee2df661.tar.bz2
opensim-SC_OLD-c513a3db5945ef059b0aa32a8bccee71ee2df661.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.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index 5e01ff1..0194c21 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -1977,6 +1977,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1977 m_timeDilation = 1; 1977 m_timeDilation = 1;
1978 if (step_time > m_SkipFramesAtms) 1978 if (step_time > m_SkipFramesAtms)
1979 step_time = 0; 1979 step_time = 0;
1980 m_lastframe = DateTime.UtcNow; // skip also the time lost
1980 } 1981 }
1981 } 1982 }
1982 1983