diff options
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs index bbfdac6..3d15eaa 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | |||
@@ -417,7 +417,10 @@ public class BSShapeCollection : IDisposable | |||
417 | 417 | ||
418 | if (shapeType == ShapeData.PhysicsShapeType.SHAPE_AVATAR) | 418 | if (shapeType == ShapeData.PhysicsShapeType.SHAPE_AVATAR) |
419 | { | 419 | { |
420 | newShape = new BulletShape(BulletSimAPI.BuildCapsuleShape2(PhysicsScene.World.ptr, shapeData), shapeType); | 420 | // The radius is scaled by 1/2 because we scale by the diameter. |
421 | newShape = new BulletShape( | ||
422 | BulletSimAPI.BuildCapsuleShape2(PhysicsScene.World.ptr, 0.5f, 1.0f, shapeData.Scale), | ||
423 | shapeType); | ||
421 | newShape.shapeKey = (System.UInt64)shapeKey; | 424 | newShape.shapeKey = (System.UInt64)shapeKey; |
422 | newShape.isNativeShape = true; | 425 | newShape.isNativeShape = true; |
423 | } | 426 | } |
@@ -428,7 +431,7 @@ public class BSShapeCollection : IDisposable | |||
428 | newShape.isNativeShape = true; | 431 | newShape.isNativeShape = true; |
429 | } | 432 | } |
430 | 433 | ||
431 | // Don't need to do a 'ReferenceShape()' here because native shapes are not tracked. | 434 | // Don't need to do a 'ReferenceShape()' here because native shapes are not shared. |
432 | // DetailLog("{0},BSShapeCollection.AddNativeShapeToPrim,create,newshape={1}", shapeData.ID, newShape); | 435 | // DetailLog("{0},BSShapeCollection.AddNativeShapeToPrim,create,newshape={1}", shapeData.ID, newShape); |
433 | 436 | ||
434 | prim.BSShape = newShape; | 437 | prim.BSShape = newShape; |