aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-28 14:44:05 -0700
committerJohn Hurliman2009-10-28 14:44:05 -0700
commita069a1ee683f67405ae66205662bb8129087030b (patch)
treef054ee5f61a13cb3c85cef368d453bafbfeaaf64
parent* Standalone logins will now go through the sequence of "requested region, de... (diff)
downloadopensim-SC-a069a1ee683f67405ae66205662bb8129087030b.zip
opensim-SC-a069a1ee683f67405ae66205662bb8129087030b.tar.gz
opensim-SC-a069a1ee683f67405ae66205662bb8129087030b.tar.bz2
opensim-SC-a069a1ee683f67405ae66205662bb8129087030b.tar.xz
Limit physics time dilation to 1.0
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3b8cd1e..8b0431c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Region.Framework.Scenes
135 protected SceneCommunicationService m_sceneGridService; 135 protected SceneCommunicationService m_sceneGridService;
136 public bool loginsdisabled = true; 136 public bool loginsdisabled = true;
137 137
138 public float TimeDilation 138 public new float TimeDilation
139 { 139 {
140 get { return m_sceneGraph.PhysicsScene.TimeDilation; } 140 get { return m_sceneGraph.PhysicsScene.TimeDilation; }
141 } 141 }
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 6ca415b..3fdf9ea 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -2672,7 +2672,7 @@ namespace OpenSim.Region.Physics.OdePlugin
2672 //(step_time == 0.004f, there's 250 of those per second. Times the step time/step size 2672 //(step_time == 0.004f, there's 250 of those per second. Times the step time/step size
2673 2673
2674 fps = (step_time / ODE_STEPSIZE) * 1000; 2674 fps = (step_time / ODE_STEPSIZE) * 1000;
2675 m_timeDilation = (step_time / ODE_STEPSIZE) / (0.09375f / ODE_STEPSIZE); 2675 m_timeDilation = Math.Min((step_time / ODE_STEPSIZE) / (0.09375f / ODE_STEPSIZE), 1.0f);
2676 2676
2677 step_time = 0.09375f; 2677 step_time = 0.09375f;
2678 2678