diff options
| author | Melanie | 2011-12-23 01:00:34 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-23 01:00:34 +0000 |
| commit | b8a914b15b57668c846ddda29686bbfffa9db1ee (patch) | |
| tree | e4c776056947e410daa3d91d1a5e3c1dc3210a72 /OpenSim/Region/Physics/OdePlugin | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fixes some problems with objects that attempt to cross a region boundary (diff) | |
| download | opensim-SC_OLD-b8a914b15b57668c846ddda29686bbfffa9db1ee.zip opensim-SC_OLD-b8a914b15b57668c846ddda29686bbfffa9db1ee.tar.gz opensim-SC_OLD-b8a914b15b57668c846ddda29686bbfffa9db1ee.tar.bz2 opensim-SC_OLD-b8a914b15b57668c846ddda29686bbfffa9db1ee.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 04ba738..2194ff0 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
| @@ -110,7 +110,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 110 | private const uint m_regionWidth = Constants.RegionSize; | 110 | private const uint m_regionWidth = Constants.RegionSize; |
| 111 | private const uint m_regionHeight = Constants.RegionSize; | 111 | private const uint m_regionHeight = Constants.RegionSize; |
| 112 | 112 | ||
| 113 | private float ODE_STEPSIZE = 0.020f; | 113 | private float ODE_STEPSIZE = 0.0178f; |
| 114 | private float metersInSpace = 29.9f; | 114 | private float metersInSpace = 29.9f; |
| 115 | private float m_timeDilation = 1.0f; | 115 | private float m_timeDilation = 1.0f; |
| 116 | 116 | ||
| @@ -456,7 +456,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 456 | mAvatarObjectContactFriction = physicsconfig.GetFloat("m_avatarobjectcontact_friction", 75f); | 456 | mAvatarObjectContactFriction = physicsconfig.GetFloat("m_avatarobjectcontact_friction", 75f); |
| 457 | mAvatarObjectContactBounce = physicsconfig.GetFloat("m_avatarobjectcontact_bounce", 0.1f); | 457 | mAvatarObjectContactBounce = physicsconfig.GetFloat("m_avatarobjectcontact_bounce", 0.1f); |
| 458 | 458 | ||
| 459 | ODE_STEPSIZE = physicsconfig.GetFloat("world_stepsize", 0.020f); | 459 | ODE_STEPSIZE = physicsconfig.GetFloat("world_stepsize", ODE_STEPSIZE); |
| 460 | m_physicsiterations = physicsconfig.GetInt("world_internal_steps_without_collisions", 10); | 460 | m_physicsiterations = physicsconfig.GetInt("world_internal_steps_without_collisions", 10); |
| 461 | 461 | ||
| 462 | avDensity = physicsconfig.GetFloat("av_density", 80f); | 462 | avDensity = physicsconfig.GetFloat("av_density", 80f); |