diff options
| author | Melanie | 2014-02-04 01:55:41 +0000 |
|---|---|---|
| committer | Melanie | 2014-02-04 01:55:41 +0000 |
| commit | e1d1c279651784d7290241b8c4b416bc4c96ab3c (patch) | |
| tree | 0a6f258ff2612b0faaf6aceadaa7be09b1f0386e /OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |
| parent | Dropping the rest of Avination's modified appearance code for core. (diff) | |
| parent | Add "--no-objects" parameter to 'load oar'. (diff) | |
| download | opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.zip opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.gz opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.bz2 opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSParam.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs index 834228e..d993e6a 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |||
| @@ -538,7 +538,7 @@ public static class BSParam | |||
| 538 | (s,o) => { s.PE.SetContactProcessingThreshold(o.PhysBody, ContactProcessingThreshold); } ), | 538 | (s,o) => { s.PE.SetContactProcessingThreshold(o.PhysBody, ContactProcessingThreshold); } ), |
| 539 | 539 | ||
| 540 | new ParameterDefn<float>("TerrainImplementation", "Type of shape to use for terrain (0=heightmap, 1=mesh)", | 540 | new ParameterDefn<float>("TerrainImplementation", "Type of shape to use for terrain (0=heightmap, 1=mesh)", |
| 541 | (float)BSTerrainPhys.TerrainImplementation.Mesh ), | 541 | (float)BSTerrainPhys.TerrainImplementation.Heightmap ), |
| 542 | new ParameterDefn<int>("TerrainMeshMagnification", "Number of times the 256x256 heightmap is multiplied to create the terrain mesh" , | 542 | new ParameterDefn<int>("TerrainMeshMagnification", "Number of times the 256x256 heightmap is multiplied to create the terrain mesh" , |
| 543 | 2 ), | 543 | 2 ), |
| 544 | new ParameterDefn<float>("TerrainFriction", "Factor to reduce movement against terrain surface" , | 544 | new ParameterDefn<float>("TerrainFriction", "Factor to reduce movement against terrain surface" , |