diff options
| author | Justin Clark-Casey (justincc) | 2013-05-23 23:07:46 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-05-23 23:07:46 +0100 |
| commit | 0d5566e879074512f385890f32dd47a747e2f7b2 (patch) | |
| tree | 6beaa5ab5a453ba36a4d0aefb1da7043f93cff7a /OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |
| parent | Fix bug where both ordinary UserManagementModule and HGUserManagementModules ... (diff) | |
| parent | Add DEBUG level logging in Meshmerizer for mesh parsing. There is (diff) | |
| download | opensim-SC-0d5566e879074512f385890f32dd47a747e2f7b2.zip opensim-SC-0d5566e879074512f385890f32dd47a747e2f7b2.tar.gz opensim-SC-0d5566e879074512f385890f32dd47a747e2f7b2.tar.bz2 opensim-SC-0d5566e879074512f385890f32dd47a747e2f7b2.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSParam.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs index 9a9e527..c19eda1 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |||
| @@ -90,6 +90,7 @@ 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; } | ||
| 93 | 94 | ||
| 94 | public static float TerrainImplementation { get; set; } | 95 | public static float TerrainImplementation { get; set; } |
| 95 | public static int TerrainMeshMagnification { get; private set; } | 96 | public static int TerrainMeshMagnification { get; private set; } |
| @@ -372,6 +373,8 @@ public static class BSParam | |||
| 372 | true ), | 373 | true ), |
| 373 | new ParameterDefn<bool>("ShouldUseGImpactShapeForPrims", "If true, use a GImpact shape for prims with cuts and twists", | 374 | new ParameterDefn<bool>("ShouldUseGImpactShapeForPrims", "If true, use a GImpact shape for prims with cuts and twists", |
| 374 | false ), | 375 | false ), |
| 376 | new ParameterDefn<bool>("ShouldUseAssetHulls", "If true, use hull if specified in the mesh asset info", | ||
| 377 | false ), | ||
| 375 | 378 | ||
| 376 | new ParameterDefn<int>("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions", | 379 | new ParameterDefn<int>("CrossingFailuresBeforeOutOfBounds", "How forgiving we are about getting into adjactent regions", |
| 377 | 5 ), | 380 | 5 ), |