diff options
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs')
-rwxr-xr-x[-rw-r--r--] | OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs index 086a412..e791b27 100644..100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs | |||
@@ -31,8 +31,8 @@ using System.Text; | |||
31 | 31 | ||
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | using OpenSim.Region.PhysicsModules.SharedBase; | 33 | using OpenSim.Region.PhysicsModules.SharedBase; |
34 | using OpenSim.Region.PhysicsModules.Meshing; | 34 | using OpenSim.Region.PhysicsModule.Meshing; |
35 | using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; | 35 | using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet; |
36 | 36 | ||
37 | using OMV = OpenMetaverse; | 37 | using OMV = OpenMetaverse; |
38 | 38 | ||
@@ -555,7 +555,9 @@ public class BSShapeMesh : BSShape | |||
555 | { | 555 | { |
556 | meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, | 556 | meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, |
557 | false, // say it is not physical so a bounding box is not built | 557 | false, // say it is not physical so a bounding box is not built |
558 | false // do not cache the mesh and do not use previously built versions | 558 | false, // do not cache the mesh and do not use previously built versions |
559 | false, | ||
560 | false | ||
559 | ); | 561 | ); |
560 | } | 562 | } |
561 | 563 | ||
@@ -712,7 +714,7 @@ public class BSShapeHull : BSShape | |||
712 | lock (physicsScene.mesher) | 714 | lock (physicsScene.mesher) |
713 | { | 715 | { |
714 | // Pass true for physicalness as this prevents the creation of bounding box which is not needed | 716 | // Pass true for physicalness as this prevents the creation of bounding box which is not needed |
715 | meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */); | 717 | meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */, false, false); |
716 | 718 | ||
717 | // If we should use the asset's hull info, fetch it out of the locked mesher | 719 | // If we should use the asset's hull info, fetch it out of the locked mesher |
718 | if (meshData != null && BSParam.ShouldUseAssetHulls) | 720 | if (meshData != null && BSParam.ShouldUseAssetHulls) |