aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
diff options
context:
space:
mode:
authorRobert Adams2013-03-09 14:15:14 -0800
committerRobert Adams2013-03-09 14:15:14 -0800
commit1120bcf123b5aa159e966a80254794f6af66f2a3 (patch)
treed2add6a1b8a5b5b24dac2820bf55af2c1b94d3fc /OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
parent* Apparently, sometimes texture entries come in from the wire with no default... (diff)
downloadopensim-SC_OLD-1120bcf123b5aa159e966a80254794f6af66f2a3.zip
opensim-SC_OLD-1120bcf123b5aa159e966a80254794f6af66f2a3.tar.gz
opensim-SC_OLD-1120bcf123b5aa159e966a80254794f6af66f2a3.tar.bz2
opensim-SC_OLD-1120bcf123b5aa159e966a80254794f6af66f2a3.tar.xz
BulletSim: remove the ability for avatars to fly off the edge of
regions when there are no region neighbors. Add some terrain location processing routines to support above.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSParam.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSParam.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index fa58109..2af8468 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -107,6 +107,7 @@ public static class BSParam
107 public static float AvatarCapsuleDepth { get; private set; } 107 public static float AvatarCapsuleDepth { get; private set; }
108 public static float AvatarCapsuleHeight { get; private set; } 108 public static float AvatarCapsuleHeight { get; private set; }
109 public static float AvatarContactProcessingThreshold { get; private set; } 109 public static float AvatarContactProcessingThreshold { get; private set; }
110 public static float AvatarBelowGroundUpCorrectionMeters { get; private set; }
110 public static float AvatarStepHeight { get; private set; } 111 public static float AvatarStepHeight { get; private set; }
111 public static float AvatarStepApproachFactor { get; private set; } 112 public static float AvatarStepApproachFactor { get; private set; }
112 public static float AvatarStepForceFactor { get; private set; } 113 public static float AvatarStepForceFactor { get; private set; }
@@ -497,6 +498,10 @@ public static class BSParam
497 0.1f, 498 0.1f,
498 (s) => { return AvatarContactProcessingThreshold; }, 499 (s) => { return AvatarContactProcessingThreshold; },
499 (s,v) => { AvatarContactProcessingThreshold = v; } ), 500 (s,v) => { AvatarContactProcessingThreshold = v; } ),
501 new ParameterDefn<float>("AvatarBelowGroundUpCorrectionMeters", "Meters to move avatar up if it seems to be below ground",
502 1.0f,
503 (s) => { return AvatarBelowGroundUpCorrectionMeters; },
504 (s,v) => { AvatarBelowGroundUpCorrectionMeters = v; } ),
500 new ParameterDefn<float>("AvatarStepHeight", "Height of a step obstacle to consider step correction", 505 new ParameterDefn<float>("AvatarStepHeight", "Height of a step obstacle to consider step correction",
501 0.3f, 506 0.3f,
502 (s) => { return AvatarStepHeight; }, 507 (s) => { return AvatarStepHeight; },