Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs

1 files changed, 38 insertions, 3 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 06186b0..8c098b2 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -82,9 +82,19 @@ public static class BSParam
         public static float AvatarStepApproachFactor { get; private set; }
         public static float AvatarStepForceFactor { get; private set; }
 
+    // Vehicle parameters
     public static float VehicleMaxLinearVelocity { get; private set; }
+    public static float VehicleMaxLinearVelocitySq { get; private set; }
     public static float VehicleMaxAngularVelocity { get; private set; }
+    public static float VehicleMaxAngularVelocitySq { get; private set; }
     public static float VehicleAngularDamping { get; private set; }
+    public static float VehicleFriction { get; private set; }
+    public static float VehicleRestitution { get; private set; }
+    public static float VehicleLinearFactor { get; private set; }
+    public static Vector3 VehicleLinearFactorV { get; private set; }
+    public static float VehicleAngularFactor { get; private set; }
+    public static Vector3 VehicleAngularFactorV { get; private set; }
+    public static float VehicleGroundGravityFudge { get; private set; }
     public static float VehicleDebuggingEnabled { get; private set; }
 
     public static float LinksetImplementation { get; private set; }
@@ -373,7 +383,7 @@ public static class BSParam
             (s) => { return TerrainRestitution; },
             (s,p,l,v) => { TerrainRestitution = v;  /* TODO: set on real terrain */ } ),
         new ParameterDefn("TerrainCollisionMargin", "Margin where collision checking starts" ,
-            0.04f,
+            0.08f,
             (s,cf,p,v) => { TerrainCollisionMargin = cf.GetFloat(p, v); },
             (s) => { return TerrainCollisionMargin; },
             (s,p,l,v) => { TerrainCollisionMargin = v;  /* TODO: set on real terrain */ } ),
@@ -443,17 +453,42 @@ public static class BSParam
             1000.0f,
             (s,cf,p,v) => { VehicleMaxLinearVelocity = cf.GetFloat(p, v); },
             (s) => { return (float)VehicleMaxLinearVelocity; },
-            (s,p,l,v) => { VehicleMaxLinearVelocity = v; } ),
+            (s,p,l,v) => { VehicleMaxLinearVelocity = v; VehicleMaxLinearVelocitySq = v * v; } ),
         new ParameterDefn("VehicleMaxAngularVelocity", "Maximum rotational velocity magnitude that can be assigned to a vehicle",
             12.0f,
             (s,cf,p,v) => { VehicleMaxAngularVelocity = cf.GetFloat(p, v); },
             (s) => { return (float)VehicleMaxAngularVelocity; },
-            (s,p,l,v) => { VehicleMaxAngularVelocity = v; } ),
+            (s,p,l,v) => { VehicleMaxAngularVelocity = v; VehicleMaxAngularVelocitySq = v * v; } ),
         new ParameterDefn("VehicleAngularDamping", "Factor to damp vehicle angular movement per second (0.0 - 1.0)",
             0.0f,
             (s,cf,p,v) => { VehicleAngularDamping = cf.GetFloat(p, v); },
             (s) => { return VehicleAngularDamping; },
             (s,p,l,v) => { VehicleAngularDamping = v; } ),
+        new ParameterDefn("VehicleLinearFactor", "Fraction of physical linear changes applied to vehicle (0.0 - 1.0)",
+            1.0f,
+            (s,cf,p,v) => { VehicleLinearFactor = cf.GetFloat(p, v); },
+            (s) => { return VehicleLinearFactor; },
+            (s,p,l,v) => { VehicleLinearFactor = v; VehicleLinearFactorV = new Vector3(v, v, v); } ),
+        new ParameterDefn("VehicleAngularFactor", "Fraction of physical angular changes applied to vehicle (0.0 - 1.0)",
+            1.0f,
+            (s,cf,p,v) => { VehicleAngularFactor = cf.GetFloat(p, v); },
+            (s) => { return VehicleAngularFactor; },
+            (s,p,l,v) => { VehicleAngularFactor = v; VehicleAngularFactorV = new Vector3(v, v, v); } ),
+        new ParameterDefn("VehicleFriction", "Friction of vehicle on the ground (0.0 - 1.0)",
+            0.0f,
+            (s,cf,p,v) => { VehicleFriction = cf.GetFloat(p, v); },
+            (s) => { return VehicleFriction; },
+            (s,p,l,v) => { VehicleFriction = v; } ),
+        new ParameterDefn("VehicleRestitution", "Bouncyness factor for vehicles (0.0 - 1.0)",
+            0.0f,
+            (s,cf,p,v) => { VehicleRestitution = cf.GetFloat(p, v); },
+            (s) => { return VehicleRestitution; },
+            (s,p,l,v) => { VehicleRestitution = v; } ),
+        new ParameterDefn("VehicleGroundGravityFudge", "Factor to multiple gravity if a ground vehicle is probably on the ground (0.0 - 1.0)",
+            0.2f,
+            (s,cf,p,v) => { VehicleGroundGravityFudge = cf.GetFloat(p, v); },
+            (s) => { return VehicleGroundGravityFudge; },
+            (s,p,l,v) => { VehicleGroundGravityFudge = v; } ),
         new ParameterDefn("VehicleDebuggingEnable", "Turn on/off vehicle debugging",
             ConfigurationParameters.numericFalse,
             (s,cf,p,v) => { VehicleDebuggingEnabled = BSParam.NumericBool(cf.GetBoolean(p, BSParam.BoolNumeric(v))); },