diff options
| author | Melanie | 2011-10-25 01:51:49 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 01:51:49 +0100 |
| commit | f4e4026a7aa132db4a0fea40c14b049989b7aa7f (patch) | |
| tree | a8336616f6804a8c0c0be6e550d7bded21351d43 /OpenSim | |
| parent | Merge commit '83c7b9b609d3c78d099a0bf18de8685676184f94' into bigmerge (diff) | |
| parent | Change hardcoded ODE total frame time to match the default total frame time (... (diff) | |
| download | opensim-SC-f4e4026a7aa132db4a0fea40c14b049989b7aa7f.zip opensim-SC-f4e4026a7aa132db4a0fea40c14b049989b7aa7f.tar.gz opensim-SC-f4e4026a7aa132db4a0fea40c14b049989b7aa7f.tar.bz2 opensim-SC-f4e4026a7aa132db4a0fea40c14b049989b7aa7f.tar.xz | |
Merge commit '4bfc2f5cdea4b739110cae3b37945d88ad527334' into bigmerge
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 2da922b..e8689a6 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
| @@ -2658,7 +2658,7 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name); | |||
| 2658 | // HACK: Using a time dilation of 1.0 to debug rubberbanding issues | 2658 | // HACK: Using a time dilation of 1.0 to debug rubberbanding issues |
| 2659 | //m_timeDilation = Math.Min((step_time / ODE_STEPSIZE) / (0.09375f / ODE_STEPSIZE), 1.0f); | 2659 | //m_timeDilation = Math.Min((step_time / ODE_STEPSIZE) / (0.09375f / ODE_STEPSIZE), 1.0f); |
| 2660 | 2660 | ||
| 2661 | step_time = 0.09375f; | 2661 | step_time = 0.089f; |
| 2662 | 2662 | ||
| 2663 | while (step_time > 0.0f) | 2663 | while (step_time > 0.0f) |
| 2664 | { | 2664 | { |