diff options
author | Justin Clark-Casey (justincc) | 2011-11-25 22:19:57 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-25 22:19:57 +0000 |
commit | b785f204ce33fc78ec4b0f9a30c20bc56ebea0d9 (patch) | |
tree | 5a1a7694e556169aa511ed62086a35be124f5f60 /OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |
parent | Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() conv... (diff) | |
download | opensim-SC_OLD-b785f204ce33fc78ec4b0f9a30c20bc56ebea0d9.zip opensim-SC_OLD-b785f204ce33fc78ec4b0f9a30c20bc56ebea0d9.tar.gz opensim-SC_OLD-b785f204ce33fc78ec4b0f9a30c20bc56ebea0d9.tar.bz2 opensim-SC_OLD-b785f204ce33fc78ec4b0f9a30c20bc56ebea0d9.tar.xz |
remove some mono compiler warnings
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 0456f56..5b28e7c 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
@@ -156,7 +156,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
156 | private bool avCapsuleTilted = true; // true = old compatibility mode with leaning capsule; false = new corrected mode | 156 | private bool avCapsuleTilted = true; // true = old compatibility mode with leaning capsule; false = new corrected mode |
157 | public bool IsAvCapsuleTilted { get { return avCapsuleTilted; } set { avCapsuleTilted = value; } } | 157 | public bool IsAvCapsuleTilted { get { return avCapsuleTilted; } set { avCapsuleTilted = value; } } |
158 | private float avDensity = 80f; | 158 | private float avDensity = 80f; |
159 | private float avHeightFudgeFactor = 0.52f; | 159 | // private float avHeightFudgeFactor = 0.52f; |
160 | private float avMovementDivisorWalk = 1.3f; | 160 | private float avMovementDivisorWalk = 1.3f; |
161 | private float avMovementDivisorRun = 0.8f; | 161 | private float avMovementDivisorRun = 0.8f; |
162 | private float minimumGroundFlightOffset = 3f; | 162 | private float minimumGroundFlightOffset = 3f; |
@@ -316,7 +316,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
316 | private int m_physicsiterations = 10; | 316 | private int m_physicsiterations = 10; |
317 | private const float m_SkipFramesAtms = 0.40f; // Drop frames gracefully at a 400 ms lag | 317 | private const float m_SkipFramesAtms = 0.40f; // Drop frames gracefully at a 400 ms lag |
318 | private readonly PhysicsActor PANull = new NullPhysicsActor(); | 318 | private readonly PhysicsActor PANull = new NullPhysicsActor(); |
319 | private float step_time = 0.0f; | 319 | // private float step_time = 0.0f; |
320 | //Ckrinke: Comment out until used. We declare it, initialize it, but do not use it | 320 | //Ckrinke: Comment out until used. We declare it, initialize it, but do not use it |
321 | //Ckrinke private int ms = 0; | 321 | //Ckrinke private int ms = 0; |
322 | public IntPtr world; | 322 | public IntPtr world; |
@@ -479,7 +479,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
479 | m_physicsiterations = physicsconfig.GetInt("world_internal_steps_without_collisions", 10); | 479 | m_physicsiterations = physicsconfig.GetInt("world_internal_steps_without_collisions", 10); |
480 | 480 | ||
481 | avDensity = physicsconfig.GetFloat("av_density", 80f); | 481 | avDensity = physicsconfig.GetFloat("av_density", 80f); |
482 | avHeightFudgeFactor = physicsconfig.GetFloat("av_height_fudge_factor", 0.52f); | 482 | // avHeightFudgeFactor = physicsconfig.GetFloat("av_height_fudge_factor", 0.52f); |
483 | avMovementDivisorWalk = physicsconfig.GetFloat("av_movement_divisor_walk", 1.3f); | 483 | avMovementDivisorWalk = physicsconfig.GetFloat("av_movement_divisor_walk", 1.3f); |
484 | avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", 0.8f); | 484 | avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", 0.8f); |
485 | avCapRadius = physicsconfig.GetFloat("av_capsule_radius", 0.37f); | 485 | avCapRadius = physicsconfig.GetFloat("av_capsule_radius", 0.37f); |
@@ -1706,7 +1706,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1706 | OdeCharacter newAv | 1706 | OdeCharacter newAv |
1707 | = new OdeCharacter( | 1707 | = new OdeCharacter( |
1708 | avName, this, pos, size, avPIDD, avPIDP, | 1708 | avName, this, pos, size, avPIDD, avPIDP, |
1709 | avCapRadius, avStandupTensor, avDensity, avHeightFudgeFactor, | 1709 | avCapRadius, avStandupTensor, avDensity, |
1710 | avMovementDivisorWalk, avMovementDivisorRun); | 1710 | avMovementDivisorWalk, avMovementDivisorRun); |
1711 | 1711 | ||
1712 | newAv.Flying = isFlying; | 1712 | newAv.Flying = isFlying; |