diff options
| author | Melanie Thielker | 2009-07-16 19:09:03 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2009-07-16 19:09:03 +0000 |
| commit | 01446074b1cc2cde2fb3789b3a00d58a899a587f (patch) | |
| tree | 0b12f38af0c141a142893dc679be9c2d41f8ea07 /OpenSim/Region | |
| parent | Allow OpenSim to run without script engines enabled (diff) | |
| download | opensim-SC-01446074b1cc2cde2fb3789b3a00d58a899a587f.zip opensim-SC-01446074b1cc2cde2fb3789b3a00d58a899a587f.tar.gz opensim-SC-01446074b1cc2cde2fb3789b3a00d58a899a587f.tar.bz2 opensim-SC-01446074b1cc2cde2fb3789b3a00d58a899a587f.tar.xz | |
Revert the nonessential part of r10033 to restore sanity to trampolines
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index e19d589..b8af77d 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -825,10 +825,12 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 825 | m_pidControllerActive = false; | 825 | m_pidControllerActive = false; |
| 826 | force *= 100f; | 826 | force *= 100f; |
| 827 | doForce(force); | 827 | doForce(force); |
| 828 | m_log.Debug("Push!"); | 828 | // If uncommented, things get pushed off world |
| 829 | _target_velocity.X += force.X; | 829 | // |
| 830 | _target_velocity.Y += force.Y; | 830 | // m_log.Debug("Push!"); |
| 831 | _target_velocity.Z += force.Z; | 831 | // _target_velocity.X += force.X; |
| 832 | // _target_velocity.Y += force.Y; | ||
| 833 | // _target_velocity.Z += force.Z; | ||
| 832 | } | 834 | } |
| 833 | else | 835 | else |
| 834 | { | 836 | { |