diff options
| author | Melanie | 2012-05-13 01:24:10 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-13 01:24:10 +0100 |
| commit | e5653ebeb795c3a04f7fb358936f5bfa82ecda6e (patch) | |
| tree | 92bf319030bf6f8f39378769887801b347ffc01d /OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Mantis 6015 new LSL function llGetAgentList. (diff) | |
| download | opensim-SC-e5653ebeb795c3a04f7fb358936f5bfa82ecda6e.zip opensim-SC-e5653ebeb795c3a04f7fb358936f5bfa82ecda6e.tar.gz opensim-SC-e5653ebeb795c3a04f7fb358936f5bfa82ecda6e.tar.bz2 opensim-SC-e5653ebeb795c3a04f7fb358936f5bfa82ecda6e.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index ca83dd7..e0de6cc 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs | |||
| @@ -536,7 +536,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 536 | // This is in addition to the step size. | 536 | // This is in addition to the step size. |
| 537 | // Essentially Steps * m_physicsiterations | 537 | // Essentially Steps * m_physicsiterations |
| 538 | d.WorldSetQuickStepNumIterations(world, m_physicsiterations); | 538 | d.WorldSetQuickStepNumIterations(world, m_physicsiterations); |
| 539 | d.WorldSetContactMaxCorrectingVel(world, 100.0f); | 539 | |
| 540 | d.WorldSetContactMaxCorrectingVel(world, 50.0f); | ||
| 540 | 541 | ||
| 541 | spacesPerMeter = 1 / metersInSpace; | 542 | spacesPerMeter = 1 / metersInSpace; |
| 542 | spaceGridMaxX = (int)(WorldExtents.X * spacesPerMeter); | 543 | spaceGridMaxX = (int)(WorldExtents.X * spacesPerMeter); |