diff options
| author | Melanie Thielker | 2009-07-14 23:20:59 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2009-07-14 23:20:59 +0000 |
| commit | 750f75c514b2fcda19edfd234f6508b2c779d7c7 (patch) | |
| tree | 9bbb21c1bc15d36e6ebfee2a79576dc2fbc8acb2 /OpenSim | |
| parent | Remove redundant distance limitaion in llRezAtRoot (diff) | |
| download | opensim-SC_OLD-750f75c514b2fcda19edfd234f6508b2c779d7c7.zip opensim-SC_OLD-750f75c514b2fcda19edfd234f6508b2c779d7c7.tar.gz opensim-SC_OLD-750f75c514b2fcda19edfd234f6508b2c779d7c7.tar.bz2 opensim-SC_OLD-750f75c514b2fcda19edfd234f6508b2c779d7c7.tar.xz | |
Thank you, Twitch, for a patch to restore mayhem and murder to OpenSim
Fixes Mantis #3888
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index b832e0a..9aff1ca 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -304,7 +304,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 304 | } | 304 | } |
| 305 | if (m_wascolliding != m_iscolliding) | 305 | if (m_wascolliding != m_iscolliding) |
| 306 | { | 306 | { |
| 307 | //base.SendCollisionUpdate(new CollisionEventUpdate()); | 307 | base.SendCollisionUpdate(new CollisionEventUpdate()); |
| 308 | } | 308 | } |
| 309 | m_wascolliding = m_iscolliding; | 309 | m_wascolliding = m_iscolliding; |
| 310 | } | 310 | } |
| @@ -358,7 +358,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 358 | } | 358 | } |
| 359 | if (m_wascollidingGround != m_iscollidingGround) | 359 | if (m_wascollidingGround != m_iscollidingGround) |
| 360 | { | 360 | { |
| 361 | //base.SendCollisionUpdate(new CollisionEventUpdate()); | 361 | base.SendCollisionUpdate(new CollisionEventUpdate()); |
| 362 | } | 362 | } |
| 363 | m_wascollidingGround = m_iscollidingGround; | 363 | m_wascollidingGround = m_iscollidingGround; |
| 364 | } | 364 | } |
| @@ -755,10 +755,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 755 | m_pidControllerActive = false; | 755 | m_pidControllerActive = false; |
| 756 | force *= 100f; | 756 | force *= 100f; |
| 757 | doForce(force); | 757 | doForce(force); |
| 758 | //m_log.Debug("Push!"); | 758 | m_log.Debug("Push!"); |
| 759 | //_target_velocity.X += force.X; | 759 | _target_velocity.X += force.X; |
| 760 | // _target_velocity.Y += force.Y; | 760 | _target_velocity.Y += force.Y; |
| 761 | //_target_velocity.Z += force.Z; | 761 | _target_velocity.Z += force.Z; |
| 762 | } | 762 | } |
| 763 | else | 763 | else |
| 764 | { | 764 | { |