diff options
| author | BlueWall | 2012-01-03 12:22:13 -0500 |
|---|---|---|
| committer | BlueWall | 2012-01-03 12:22:13 -0500 |
| commit | e78a3913e03b387cae9f9885bfbc4bc4e6f79381 (patch) | |
| tree | 1360cefc23ae2516e79a80293b17576fca07d04d /OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |
| parent | Merge branch 'new_modules' (diff) | |
| parent | Reduce accessibility of some J2KImage/LLImageManager properties and methods t... (diff) | |
| download | opensim-SC_OLD-e78a3913e03b387cae9f9885bfbc4bc4e6f79381.zip opensim-SC_OLD-e78a3913e03b387cae9f9885bfbc4bc4e6f79381.tar.gz opensim-SC_OLD-e78a3913e03b387cae9f9885bfbc4bc4e6f79381.tar.bz2 opensim-SC_OLD-e78a3913e03b387cae9f9885bfbc4bc4e6f79381.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdeScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 2194ff0..228eca9 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
| @@ -2822,6 +2822,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 2822 | m_global_contactcount = 0; | 2822 | m_global_contactcount = 0; |
| 2823 | 2823 | ||
| 2824 | d.WorldQuickStep(world, ODE_STEPSIZE); | 2824 | d.WorldQuickStep(world, ODE_STEPSIZE); |
| 2825 | |||
| 2825 | d.JointGroupEmpty(contactgroup); | 2826 | d.JointGroupEmpty(contactgroup); |
| 2826 | } | 2827 | } |
| 2827 | catch (Exception e) | 2828 | catch (Exception e) |