diff options
| author | Oren Hurvitz | 2014-07-16 13:02:02 +0300 |
|---|---|---|
| committer | Oren Hurvitz | 2014-07-21 09:27:57 +0100 |
| commit | feacae173e3ec56dbb6c0f4186cee12b7a86cb23 (patch) | |
| tree | a99a95c1fb788d41855722503ecd6d8de2edae2a /OpenSim | |
| parent | Allow reading the BulletSim detail log while the sim is running (diff) | |
| download | opensim-SC_OLD-feacae173e3ec56dbb6c0f4186cee12b7a86cb23.zip opensim-SC_OLD-feacae173e3ec56dbb6c0f4186cee12b7a86cb23.tar.gz opensim-SC_OLD-feacae173e3ec56dbb6c0f4186cee12b7a86cb23.tar.bz2 opensim-SC_OLD-feacae173e3ec56dbb6c0f4186cee12b7a86cb23.tar.xz | |
Fixed avatar hovering above the ground. The avatar physics capsule was too tall.
This is related to http://opensimulator.org/mantis/view.php?id=7067 .
But that bug complains about BulletSim, and this fix is for ODE.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 7df74f3..8f37b79 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -500,8 +500,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 500 | { | 500 | { |
| 501 | m_pidControllerActive = true; | 501 | m_pidControllerActive = true; |
| 502 | 502 | ||
| 503 | m_tainted_CAPSULE_LENGTH = (size.Z * 1.15f) - CAPSULE_RADIUS * 2.0f; | 503 | m_tainted_CAPSULE_LENGTH = size.Z - CAPSULE_RADIUS * 2.0f; |
| 504 | // m_log.Info("[ODE CHARACTER]: " + CAPSULE_LENGTH); | 504 | |
| 505 | // m_log.InfoFormat("[ODE CHARACTER]: Size = {0}, Capsule Length = {1} (Capsule Radius = {2})", | ||
| 506 | // size, m_tainted_CAPSULE_LENGTH, CAPSULE_RADIUS); | ||
| 505 | } | 507 | } |
| 506 | else | 508 | else |
| 507 | { | 509 | { |