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