diff options
author | Melanie | 2013-01-16 01:11:20 +0000 |
---|---|---|
committer | Melanie | 2013-01-16 01:11:20 +0000 |
commit | fc5711fa7ab3bcd0d81737735d098f070a7132bb (patch) | |
tree | 06fbc4ebf2a4788f4ffd65010d6abadfb2ffafae /OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | BulletSim: disable center-of-mass computation for linksets until debugged. Mo... (diff) | |
download | opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.zip opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.gz opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.bz2 opensim-SC-fc5711fa7ab3bcd0d81737735d098f070a7132bb.tar.xz |
Merge commit '8bf0a9f85dda4b1831630b65620d5c6868196c11' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.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 23d573f..27ff047 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | |||
@@ -80,6 +80,7 @@ public static class BSParam | |||
80 | public static float AvatarStepForceFactor { get; private set; } | 80 | public static float AvatarStepForceFactor { get; private set; } |
81 | 81 | ||
82 | public static float VehicleAngularDamping { get; private set; } | 82 | public static float VehicleAngularDamping { get; private set; } |
83 | public static float VehicleDebuggingEnabled { get; private set; } | ||
83 | 84 | ||
84 | public static float LinksetImplementation { get; private set; } | 85 | public static float LinksetImplementation { get; private set; } |
85 | public static float LinkConstraintUseFrameOffset { get; private set; } | 86 | public static float LinkConstraintUseFrameOffset { get; private set; } |
@@ -427,6 +428,11 @@ public static class BSParam | |||
427 | (s,cf,p,v) => { VehicleAngularDamping = cf.GetFloat(p, v); }, | 428 | (s,cf,p,v) => { VehicleAngularDamping = cf.GetFloat(p, v); }, |
428 | (s) => { return VehicleAngularDamping; }, | 429 | (s) => { return VehicleAngularDamping; }, |
429 | (s,p,l,v) => { VehicleAngularDamping = v; } ), | 430 | (s,p,l,v) => { VehicleAngularDamping = v; } ), |
431 | new ParameterDefn("VehicleDebuggingEnable", "Turn on/off vehicle debugging", | ||
432 | ConfigurationParameters.numericFalse, | ||
433 | (s,cf,p,v) => { VehicleDebuggingEnabled = BSParam.NumericBool(cf.GetBoolean(p, BSParam.BoolNumeric(v))); }, | ||
434 | (s) => { return VehicleDebuggingEnabled; }, | ||
435 | (s,p,l,v) => { VehicleDebuggingEnabled = v; } ), | ||
430 | 436 | ||
431 | new ParameterDefn("MaxPersistantManifoldPoolSize", "Number of manifolds pooled (0 means default of 4096)", | 437 | new ParameterDefn("MaxPersistantManifoldPoolSize", "Number of manifolds pooled (0 means default of 4096)", |
432 | 0f, | 438 | 0f, |