diff options
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs index 9ef2923..3e4ee5a 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs | |||
@@ -352,9 +352,6 @@ public class BSShapeMesh : BSShape | |||
352 | float lod; | 352 | float lod; |
353 | System.UInt64 newMeshKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod); | 353 | System.UInt64 newMeshKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod); |
354 | 354 | ||
355 | physicsScene.DetailLog("{0},BSShapeMesh,getReference,newKey={1},size={2},lod={3}", | ||
356 | prim.LocalID, newMeshKey.ToString("X"), prim.Size, lod); | ||
357 | |||
358 | BSShapeMesh retMesh = null; | 355 | BSShapeMesh retMesh = null; |
359 | lock (Meshes) | 356 | lock (Meshes) |
360 | { | 357 | { |
@@ -380,6 +377,7 @@ public class BSShapeMesh : BSShape | |||
380 | retMesh.physShapeInfo = newShape; | 377 | retMesh.physShapeInfo = newShape; |
381 | } | 378 | } |
382 | } | 379 | } |
380 | physicsScene.DetailLog("{0},BSShapeMesh,getReference,mesh={1},size={2},lod={3}", prim.LocalID, retMesh, prim.Size, lod); | ||
383 | return retMesh; | 381 | return retMesh; |
384 | } | 382 | } |
385 | public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim) | 383 | public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim) |
@@ -507,9 +505,6 @@ public class BSShapeHull : BSShape | |||
507 | float lod; | 505 | float lod; |
508 | System.UInt64 newHullKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod); | 506 | System.UInt64 newHullKey = BSShape.ComputeShapeKey(prim.Size, prim.BaseShape, out lod); |
509 | 507 | ||
510 | physicsScene.DetailLog("{0},BSShapeHull,getReference,newKey={1},size={2},lod={3}", | ||
511 | prim.LocalID, newHullKey.ToString("X"), prim.Size, lod); | ||
512 | |||
513 | BSShapeHull retHull = null; | 508 | BSShapeHull retHull = null; |
514 | lock (Hulls) | 509 | lock (Hulls) |
515 | { | 510 | { |
@@ -531,10 +526,10 @@ public class BSShapeHull : BSShape | |||
531 | // If a mesh was what was created, remember the built shape for later sharing. | 526 | // If a mesh was what was created, remember the built shape for later sharing. |
532 | Hulls.Add(newHullKey, retHull); | 527 | Hulls.Add(newHullKey, retHull); |
533 | } | 528 | } |
534 | |||
535 | retHull.physShapeInfo = newShape; | 529 | retHull.physShapeInfo = newShape; |
536 | } | 530 | } |
537 | } | 531 | } |
532 | physicsScene.DetailLog("{0},BSShapeHull,getReference,hull={1},size={2},lod={3}", prim.LocalID, retHull, prim.Size, lod); | ||
538 | return retHull; | 533 | return retHull; |
539 | } | 534 | } |
540 | public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim) | 535 | public override BSShape GetReference(BSScene pPhysicsScene, BSPhysObject pPrim) |