aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
diff options
context:
space:
mode:
authorRobert Adams2013-05-21 22:16:18 -0700
committerRobert Adams2013-05-21 22:16:18 -0700
commit6596a1de806d1ec509f3a570a0944ab9aff5947c (patch)
tree3c8719b8d502fc1e3c115c40768bebccf689c93a /OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
parentBulletSim: update DLLs and SOs with version containing gImpact code. (diff)
downloadopensim-SC_OLD-6596a1de806d1ec509f3a570a0944ab9aff5947c.zip
opensim-SC_OLD-6596a1de806d1ec509f3a570a0944ab9aff5947c.tar.gz
opensim-SC_OLD-6596a1de806d1ec509f3a570a0944ab9aff5947c.tar.bz2
opensim-SC_OLD-6596a1de806d1ec509f3a570a0944ab9aff5947c.tar.xz
Revert "BulletSim: add code to experimentally use asset hull data."
This reverts commit 2fd8819a043269f9308cb46c71893e6eb35a426e. Remove this code until I can figure out why the references that are clearly in prebuild.xml doesn't work for the 'using OpenSim.Region.Physics.Meshing' in BSShape.cs.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSParam.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSParam.cs3
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 5cff668..9a9e527 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -90,7 +90,6 @@ public static class BSParam
90 public static bool ShouldUseBulletHACD { get; set; } 90 public static bool ShouldUseBulletHACD { get; set; }
91 public static bool ShouldUseSingleConvexHullForPrims { get; set; } 91 public static bool ShouldUseSingleConvexHullForPrims { get; set; }
92 public static bool ShouldUseGImpactShapeForPrims { get; set; } 92 public static bool ShouldUseGImpactShapeForPrims { get; set; }
93 public static bool ShouldUseAssetHulls { get; set; }
94 93
95 public static float TerrainImplementation { get; set; } 94 public static float TerrainImplementation { get; set; }
96 public static int TerrainMeshMagnification { get; private set; } 95 public static int TerrainMeshMagnification { get; private set; }
@@ -373,8 +372,6 @@ public static class BSParam
373 true ), 372 true ),
374 new ParameterDefn<bool>("ShouldUseGImpactShapeForPrims", "If true, use a GImpact shape for prims with cuts and twists", 373 new ParameterDefn<bool>("ShouldUseGImpactShapeForPrims", "If true, use a GImpact shape for prims with cuts and twists",
375 false ), 374 false ),
376 new ParameterDefn<bool>("UseAssetHulls", "If true, use hull if specified in the mesh asset info",
377 false ),
378 375
379 new ParameterDefn<int>("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions", 376 new ParameterDefn<int>("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions",
380 5 ), 377 5 ),