diff options
author | Teravus Ovares | 2007-12-22 05:43:34 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-12-22 05:43:34 +0000 |
commit | de32006f9a0843c9d115fc6c2c92d64046f52ee0 (patch) | |
tree | bbf3414bcc1cb3c9cb88da40be986b399fce6cc5 /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |
parent | Vanity commit (diff) | |
download | opensim-SC_OLD-de32006f9a0843c9d115fc6c2c92d64046f52ee0.zip opensim-SC_OLD-de32006f9a0843c9d115fc6c2c92d64046f52ee0.tar.gz opensim-SC_OLD-de32006f9a0843c9d115fc6c2c92d64046f52ee0.tar.bz2 opensim-SC_OLD-de32006f9a0843c9d115fc6c2c92d64046f52ee0.tar.xz |
* Added smoother handling of interpenetrating physical objects.
* Fixes:
* -- duplicating Active physical object causes objects to explode in opposite directions
* -- Rezzing objects too close to you avatar causes avatar to shoot around in odd directions
* Vanity
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index 04bf9a0..3bdf180 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
@@ -174,7 +174,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
174 | } | 174 | } |
175 | if (m_wascolliding != m_iscolliding) | 175 | if (m_wascolliding != m_iscolliding) |
176 | { | 176 | { |
177 | base.SendCollisionUpdate(new CollisionEventUpdate()); | 177 | //base.SendCollisionUpdate(new CollisionEventUpdate()); |
178 | 178 | ||
179 | } | 179 | } |
180 | m_wascolliding = m_iscolliding; | 180 | m_wascolliding = m_iscolliding; |
@@ -527,7 +527,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
527 | if (_velocity.Z < -6 && !m_hackSentFall) | 527 | if (_velocity.Z < -6 && !m_hackSentFall) |
528 | { | 528 | { |
529 | m_hackSentFall = true; | 529 | m_hackSentFall = true; |
530 | base.SendCollisionUpdate(new CollisionEventUpdate()); | 530 | //base.SendCollisionUpdate(new CollisionEventUpdate()); |
531 | m_pidControllerActive = false; | 531 | m_pidControllerActive = false; |
532 | } | 532 | } |
533 | else if (flying && !m_hackSentFly) | 533 | else if (flying && !m_hackSentFly) |