diff options
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index a250a6a..f735f60 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -817,18 +817,18 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
817 | // appears to be phantom for the world | 817 | // appears to be phantom for the world |
818 | Boolean skipThisContact = false; | 818 | Boolean skipThisContact = false; |
819 | 819 | ||
820 | if (contacts[i].depth < 0f) | ||
821 | skipThisContact = true; | ||
822 | |||
823 | if (checkDupe(contacts[i], p2.PhysicsActorType)) | ||
824 | skipThisContact = true; | ||
825 | |||
826 | if ((p1 is OdePrim) && (((OdePrim)p1).m_isVolumeDetect)) | 820 | if ((p1 is OdePrim) && (((OdePrim)p1).m_isVolumeDetect)) |
827 | skipThisContact = true; // No collision on volume detect prims | 821 | skipThisContact = true; // No collision on volume detect prims |
828 | 822 | ||
829 | if ((p2 is OdePrim) && (((OdePrim)p2).m_isVolumeDetect)) | 823 | if (!skipThisContact && (p2 is OdePrim) && (((OdePrim)p2).m_isVolumeDetect)) |
830 | skipThisContact = true; // No collision on volume detect prims | 824 | skipThisContact = true; // No collision on volume detect prims |
831 | 825 | ||
826 | if (!skipThisContact && contacts[i].depth < 0f) | ||
827 | skipThisContact = true; | ||
828 | |||
829 | if (!skipThisContact && checkDupe(contacts[i], p2.PhysicsActorType)) | ||
830 | skipThisContact = true; | ||
831 | |||
832 | if (!skipThisContact) | 832 | if (!skipThisContact) |
833 | { | 833 | { |
834 | // If we're colliding against terrain | 834 | // If we're colliding against terrain |