From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 21:24:15 +1000 Subject: Dump OpenSim 0.9.0.1 into it's own branch. --- OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs') diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs old mode 100644 new mode 100755 index 086a412..e791b27 --- a/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSShapes.cs @@ -31,8 +31,8 @@ using System.Text; using OpenSim.Framework; using OpenSim.Region.PhysicsModules.SharedBase; -using OpenSim.Region.PhysicsModules.Meshing; -using OpenSim.Region.PhysicsModule.ConvexDecompositionDotNet; +using OpenSim.Region.PhysicsModule.Meshing; +using OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet; using OMV = OpenMetaverse; @@ -555,7 +555,9 @@ public class BSShapeMesh : BSShape { meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, false, // say it is not physical so a bounding box is not built - false // do not cache the mesh and do not use previously built versions + false, // do not cache the mesh and do not use previously built versions + false, + false ); } @@ -712,7 +714,7 @@ public class BSShapeHull : BSShape lock (physicsScene.mesher) { // Pass true for physicalness as this prevents the creation of bounding box which is not needed - meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */); + meshData = physicsScene.mesher.CreateMesh(prim.PhysObjectName, pbs, size, lod, true /* isPhysical */, false /* shouldCache */, false, false); // If we should use the asset's hull info, fetch it out of the locked mesher if (meshData != null && BSParam.ShouldUseAssetHulls) -- cgit v1.1