aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
diff options
context:
space:
mode:
authorTeravus Ovares2009-03-07 07:17:43 +0000
committerTeravus Ovares2009-03-07 07:17:43 +0000
commit5a49c772ca41b92fe7b6e00858fa9add24b6d8a3 (patch)
tree449d11eb8f8be6f9b2ca090c001708a728e39b51 /OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
parent* fixes mantis 3259 (diff)
downloadopensim-SC_OLD-5a49c772ca41b92fe7b6e00858fa9add24b6d8a3.zip
opensim-SC_OLD-5a49c772ca41b92fe7b6e00858fa9add24b6d8a3.tar.gz
opensim-SC_OLD-5a49c772ca41b92fe7b6e00858fa9add24b6d8a3.tar.bz2
opensim-SC_OLD-5a49c772ca41b92fe7b6e00858fa9add24b6d8a3.tar.xz
* Making the minimum ground offset for flying a configurable offset in the OpenSim.ini. This is the code that causes you to rise off the ground when you press the fly button and attempts to keep you above ground automatically when flying in a simulator.
* minimum_ground_flight_offset, by default is 3 meters, as per Kitto Flora See OpenSim.ini.example for an example.
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 7a01702..779ad1a 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -181,6 +181,7 @@ namespace OpenSim.Region.Physics.OdePlugin
181 private float avHeightFudgeFactor = 0.52f; 181 private float avHeightFudgeFactor = 0.52f;
182 private float avMovementDivisorWalk = 1.3f; 182 private float avMovementDivisorWalk = 1.3f;
183 private float avMovementDivisorRun = 0.8f; 183 private float avMovementDivisorRun = 0.8f;
184 private float minimumGroundFlightOffset = 3f;
184 185
185 public bool meshSculptedPrim = true; 186 public bool meshSculptedPrim = true;
186 187
@@ -432,6 +433,7 @@ namespace OpenSim.Region.Physics.OdePlugin
432 physics_logging_append_existing_logfile = physicsconfig.GetBoolean("physics_logging_append_existing_logfile", false); 433 physics_logging_append_existing_logfile = physicsconfig.GetBoolean("physics_logging_append_existing_logfile", false);
433 434
434 m_NINJA_physics_joints_enabled = physicsconfig.GetBoolean("use_NINJA_physics_joints", false); 435 m_NINJA_physics_joints_enabled = physicsconfig.GetBoolean("use_NINJA_physics_joints", false);
436 minimumGroundFlightOffset = physicsconfig.GetFloat("minimum_ground_flight_offset", 3f);
435 437
436 } 438 }
437 } 439 }
@@ -1336,6 +1338,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1336 pos.Z = position.Z; 1338 pos.Z = position.Z;
1337 OdeCharacter newAv = new OdeCharacter(avName, this, pos, ode, size, avPIDD, avPIDP, avCapRadius, avStandupTensor, avDensity, avHeightFudgeFactor, avMovementDivisorWalk, avMovementDivisorRun); 1339 OdeCharacter newAv = new OdeCharacter(avName, this, pos, ode, size, avPIDD, avPIDP, avCapRadius, avStandupTensor, avDensity, avHeightFudgeFactor, avMovementDivisorWalk, avMovementDivisorRun);
1338 newAv.Flying = isFlying; 1340 newAv.Flying = isFlying;
1341 newAv.MinimumGroundFlightOffset = minimumGroundFlightOffset;
1339 _characters.Add(newAv); 1342 _characters.Add(newAv);
1340 return newAv; 1343 return newAv;
1341 } 1344 }