diff options
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index f1d8232..1aa141b 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -405,8 +405,15 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
405 | // If you interpenetrate a prim with another prim | 405 | // If you interpenetrate a prim with another prim |
406 | if (p1.PhysicsActorType == (int) ActorTypes.Prim && p2.PhysicsActorType == (int) ActorTypes.Prim) | 406 | if (p1.PhysicsActorType == (int) ActorTypes.Prim && p2.PhysicsActorType == (int) ActorTypes.Prim) |
407 | { | 407 | { |
408 | // Don't collide, one or both prim will explode. | 408 | if (contacts[i].depth >= 0.25f) |
409 | contacts[i].depth = 0f; | 409 | { |
410 | // Don't collide, one or both prim will explode. | ||
411 | ((OdePrim)p1).m_taintdisable = true; | ||
412 | AddPhysicsActorTaint(p1); | ||
413 | ((OdePrim)p2).m_taintdisable = true; | ||
414 | AddPhysicsActorTaint(p2); | ||
415 | contacts[i].depth = 0f; | ||
416 | } | ||
410 | } | 417 | } |
411 | if (contacts[i].depth >= 1.00f) | 418 | if (contacts[i].depth >= 1.00f) |
412 | { | 419 | { |