diff options
author | Melanie | 2012-12-18 09:45:40 +0000 |
---|---|---|
committer | Melanie | 2012-12-18 09:45:40 +0000 |
commit | caea7601cb64be6c872dd44b61df10fb2e5f4e96 (patch) | |
tree | 9cba3186c574d3ecbef73646e0efc3ab3b68f90c /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-caea7601cb64be6c872dd44b61df10fb2e5f4e96.zip opensim-SC-caea7601cb64be6c872dd44b61df10fb2e5f4e96.tar.gz opensim-SC-caea7601cb64be6c872dd44b61df10fb2e5f4e96.tar.bz2 opensim-SC-caea7601cb64be6c872dd44b61df10fb2e5f4e96.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 7b44574..069cb0d 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
@@ -189,7 +189,6 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
189 | // 'true' of the vehicle code is to log lots of details | 189 | // 'true' of the vehicle code is to log lots of details |
190 | public bool VehicleLoggingEnabled { get; private set; } | 190 | public bool VehicleLoggingEnabled { get; private set; } |
191 | public bool VehiclePhysicalLoggingEnabled { get; private set; } | 191 | public bool VehiclePhysicalLoggingEnabled { get; private set; } |
192 | public bool VehicleScaleAngularVelocityByTimestep { get; private set; } | ||
193 | 192 | ||
194 | #region Construction and Initialization | 193 | #region Construction and Initialization |
195 | public BSScene(string identifier) | 194 | public BSScene(string identifier) |
@@ -1239,11 +1238,6 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
1239 | (s,cf,p,v) => { s.m_params[0].vehicleAngularDamping = cf.GetFloat(p, v); }, | 1238 | (s,cf,p,v) => { s.m_params[0].vehicleAngularDamping = cf.GetFloat(p, v); }, |
1240 | (s) => { return s.m_params[0].vehicleAngularDamping; }, | 1239 | (s) => { return s.m_params[0].vehicleAngularDamping; }, |
1241 | (s,p,l,v) => { s.m_params[0].vehicleAngularDamping = v; } ), | 1240 | (s,p,l,v) => { s.m_params[0].vehicleAngularDamping = v; } ), |
1242 | new ParameterDefn("VehicleScaleAngularVelocityByTimestep", "If true, scale angular turning by timestep", | ||
1243 | ConfigurationParameters.numericFalse, | ||
1244 | (s,cf,p,v) => { s.VehicleScaleAngularVelocityByTimestep = cf.GetBoolean(p, s.BoolNumeric(v)); }, | ||
1245 | (s) => { return s.NumericBool(s.VehicleScaleAngularVelocityByTimestep); }, | ||
1246 | (s,p,l,v) => { s.VehicleScaleAngularVelocityByTimestep = s.BoolNumeric(v); } ), | ||
1247 | 1241 | ||
1248 | new ParameterDefn("MaxPersistantManifoldPoolSize", "Number of manifolds pooled (0 means default of 4096)", | 1242 | new ParameterDefn("MaxPersistantManifoldPoolSize", "Number of manifolds pooled (0 means default of 4096)", |
1249 | 0f, | 1243 | 0f, |