diff options
| author | Robert Adams | 2013-01-04 17:05:56 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-01-04 17:06:52 -0800 |
| commit | 2eba80a8cd254721956bcdc9f7e3b681d415dfed (patch) | |
| tree | a162e5e8f23f0df256ab6cb308f5ac8d54a2582a /OpenSim | |
| parent | BulletSim: implement llMoveToTarget by adding PIDActive, etc. (diff) | |
| download | opensim-SC-2eba80a8cd254721956bcdc9f7e3b681d415dfed.zip opensim-SC-2eba80a8cd254721956bcdc9f7e3b681d415dfed.tar.gz opensim-SC-2eba80a8cd254721956bcdc9f7e3b681d415dfed.tar.bz2 opensim-SC-2eba80a8cd254721956bcdc9f7e3b681d415dfed.tar.xz | |
BulletSim: fix problem where mesh shapes were physically just their bounding box and not the complete mesh. Fill mesh physical objects are back.
Diffstat (limited to 'OpenSim')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs index d361f18..f0c6b99 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | |||
| @@ -453,6 +453,7 @@ public sealed class BSShapeCollection : IDisposable | |||
| 453 | // If the prim attributes are simple, this could be a simple Bullet native shape | 453 | // If the prim attributes are simple, this could be a simple Bullet native shape |
| 454 | if (!haveShape | 454 | if (!haveShape |
| 455 | && pbs != null | 455 | && pbs != null |
| 456 | && !pbs.SculptEntry | ||
| 456 | && nativeShapePossible | 457 | && nativeShapePossible |
| 457 | && ((pbs.SculptEntry && !BSParam.ShouldMeshSculptedPrim) | 458 | && ((pbs.SculptEntry && !BSParam.ShouldMeshSculptedPrim) |
| 458 | || (pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0 | 459 | || (pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0 |