diff options
| author | Robert Adams | 2013-01-14 15:46:46 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-01-14 15:46:46 -0800 |
| commit | 4e1ca890c2d41bf244ed7d4847c0d0a4fc7f6c51 (patch) | |
| tree | bef4e616c6fb6a3de0e6859b6ef3e664095c2ae6 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
| parent | BulletSim: disable center-of-mass computation for linksets until debugged. Mo... (diff) | |
| download | opensim-SC_OLD-4e1ca890c2d41bf244ed7d4847c0d0a4fc7f6c51.zip opensim-SC_OLD-4e1ca890c2d41bf244ed7d4847c0d0a4fc7f6c51.tar.gz opensim-SC_OLD-4e1ca890c2d41bf244ed7d4847c0d0a4fc7f6c51.tar.bz2 opensim-SC_OLD-4e1ca890c2d41bf244ed7d4847c0d0a4fc7f6c51.tar.xz | |
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.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 379 | // If the object is below ground it just has to be moved up because pushing will | 379 | // If the object is below ground it just has to be moved up because pushing will |
| 380 | // not get it through the terrain | 380 | // not get it through the terrain |
| 381 | _position.Z = targetHeight; | 381 | _position.Z = targetHeight; |
| 382 | if (!inTaintTime) | 382 | if (inTaintTime) |
| 383 | ForcePosition = _position; | 383 | ForcePosition = _position; |
| 384 | ret = true; | 384 | ret = true; |
| 385 | } | 385 | } |