diff options
| author | Melanie Thielker | 2014-07-19 22:32:07 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-07-19 22:32:07 +0200 |
| commit | e1b2ecdfdc5d465ee86d2a726eff2e504c846e79 (patch) | |
| tree | fa54372d3e4434ed14ff773c0889364895f87529 /OpenSim/Region/Physics/OdePlugin | |
| parent | fix attachments (diff) | |
| parent | revert to capsule representation of avatar collider (diff) | |
| download | opensim-SC-e1b2ecdfdc5d465ee86d2a726eff2e504c846e79.zip opensim-SC-e1b2ecdfdc5d465ee86d2a726eff2e504c846e79.tar.gz opensim-SC-e1b2ecdfdc5d465ee86d2a726eff2e504c846e79.tar.bz2 opensim-SC-e1b2ecdfdc5d465ee86d2a726eff2e504c846e79.tar.xz | |
Merge branch 'avination-current'
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 319f6ab..86735de 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -500,7 +500,7 @@ 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 | // m_log.Info("[ODE CHARACTER]: " + CAPSULE_LENGTH); |
| 505 | } | 505 | } |
| 506 | else | 506 | else |