From 4e1ca890c2d41bf244ed7d4847c0d0a4fc7f6c51 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 14 Jan 2013 15:46:46 -0800
Subject: BulletSim: fix not moving physical objects below terrain to over
 terrain. Add locking on register prestep action list preventing potential
 race conditions. Little comment and formatting changes.

---
 OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index e5f7ab7..79fe632 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -379,7 +379,7 @@ public sealed class BSPrim : BSPhysObject
             // If the object is below ground it just has to be moved up because pushing will
             //     not get it through the terrain
             _position.Z = targetHeight;
-            if (!inTaintTime)
+            if (inTaintTime)
                 ForcePosition = _position;
             ret = true;
         }
-- 
cgit v1.1