diff options
author | Melanie | 2012-12-30 03:43:51 +0000 |
---|---|---|
committer | Melanie | 2012-12-30 03:43:51 +0000 |
commit | 7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5 (patch) | |
tree | e2b5b94a95511a6e26c56b611e7b7445c28d119f /OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | BulletSim: remove check for small motor movement because, while it (diff) | |
download | opensim-SC_OLD-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.zip opensim-SC_OLD-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.tar.gz opensim-SC_OLD-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.tar.bz2 opensim-SC_OLD-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs index f8f24bd..5c8553a 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |||
@@ -68,6 +68,7 @@ public static class BSParam | |||
68 | // Avatar parameters | 68 | // Avatar parameters |
69 | public static float AvatarFriction { get; private set; } | 69 | public static float AvatarFriction { get; private set; } |
70 | public static float AvatarStandingFriction { get; private set; } | 70 | public static float AvatarStandingFriction { get; private set; } |
71 | public static float AvatarAlwaysRunFactor { get; private set; } | ||
71 | public static float AvatarDensity { get; private set; } | 72 | public static float AvatarDensity { get; private set; } |
72 | public static float AvatarRestitution { get; private set; } | 73 | public static float AvatarRestitution { get; private set; } |
73 | public static float AvatarCapsuleWidth { get; private set; } | 74 | public static float AvatarCapsuleWidth { get; private set; } |
@@ -367,6 +368,11 @@ public static class BSParam | |||
367 | (s,cf,p,v) => { AvatarStandingFriction = cf.GetFloat(p, v); }, | 368 | (s,cf,p,v) => { AvatarStandingFriction = cf.GetFloat(p, v); }, |
368 | (s) => { return AvatarStandingFriction; }, | 369 | (s) => { return AvatarStandingFriction; }, |
369 | (s,p,l,v) => { AvatarStandingFriction = v; } ), | 370 | (s,p,l,v) => { AvatarStandingFriction = v; } ), |
371 | new ParameterDefn("AvatarAlwaysRunFactor", "Speed multiplier if avatar is set to always run", | ||
372 | 1.3f, | ||
373 | (s,cf,p,v) => { AvatarAlwaysRunFactor = cf.GetFloat(p, v); }, | ||
374 | (s) => { return AvatarAlwaysRunFactor; }, | ||
375 | (s,p,l,v) => { AvatarAlwaysRunFactor = v; } ), | ||
370 | new ParameterDefn("AvatarDensity", "Density of an avatar. Changed on avatar recreation.", | 376 | new ParameterDefn("AvatarDensity", "Density of an avatar. Changed on avatar recreation.", |
371 | 3.5f, | 377 | 3.5f, |
372 | (s,cf,p,v) => { AvatarDensity = cf.GetFloat(p, v); }, | 378 | (s,cf,p,v) => { AvatarDensity = cf.GetFloat(p, v); }, |