diff options
| author | Melanie | 2013-01-16 01:13:14 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-16 01:13:14 +0000 |
| commit | 70fa41863d1f2291d439592682b8d9fa78fa0f06 (patch) | |
| tree | 623b693af0ceec2e5b0cda8d265b8139c757627b /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
| parent | Merge commit '7978b349bd400d14b7ecd4f8274af1921f435fee' into careminster (diff) | |
| parent | Merge branch 'master' of /home/opensim/var/repo/opensim (diff) | |
| download | opensim-SC-70fa41863d1f2291d439592682b8d9fa78fa0f06.zip opensim-SC-70fa41863d1f2291d439592682b8d9fa78fa0f06.tar.gz opensim-SC-70fa41863d1f2291d439592682b8d9fa78fa0f06.tar.bz2 opensim-SC-70fa41863d1f2291d439592682b8d9fa78fa0f06.tar.xz | |
Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster
Diffstat (limited to '')
| -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 | } |