diff options
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/OdePlugin.cs')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index a8e006b..981cf43 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -439,7 +439,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
439 | avMovementDivisorWalk = physicsconfig.GetFloat("av_movement_divisor_walk", 1.3f); | 439 | avMovementDivisorWalk = physicsconfig.GetFloat("av_movement_divisor_walk", 1.3f); |
440 | avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", 0.8f); | 440 | avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", 0.8f); |
441 | avCapRadius = physicsconfig.GetFloat("av_capsule_radius", 0.37f); | 441 | avCapRadius = physicsconfig.GetFloat("av_capsule_radius", 0.37f); |
442 | avCapsuleTilted = physicsconfig.GetBoolean("av_capsule_tilted", true); | 442 | avCapsuleTilted = physicsconfig.GetBoolean("av_capsule_tilted", false); |
443 | 443 | ||
444 | contactsPerCollision = physicsconfig.GetInt("contacts_per_collision", 80); | 444 | contactsPerCollision = physicsconfig.GetInt("contacts_per_collision", 80); |
445 | 445 | ||
@@ -3541,7 +3541,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3541 | public override void UnCombine(PhysicsScene pScene) | 3541 | public override void UnCombine(PhysicsScene pScene) |
3542 | { | 3542 | { |
3543 | IntPtr localGround = IntPtr.Zero; | 3543 | IntPtr localGround = IntPtr.Zero; |
3544 | float[] localHeightfield; | 3544 | // float[] localHeightfield; |
3545 | bool proceed = false; | 3545 | bool proceed = false; |
3546 | List<IntPtr> geomDestroyList = new List<IntPtr>(); | 3546 | List<IntPtr> geomDestroyList = new List<IntPtr>(); |
3547 | 3547 | ||
@@ -3553,7 +3553,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3553 | { | 3553 | { |
3554 | if (geom == localGround) | 3554 | if (geom == localGround) |
3555 | { | 3555 | { |
3556 | localHeightfield = TerrainHeightFieldHeights[geom]; | 3556 | // localHeightfield = TerrainHeightFieldHeights[geom]; |
3557 | proceed = true; | 3557 | proceed = true; |
3558 | } | 3558 | } |
3559 | else | 3559 | else |
@@ -3575,7 +3575,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3575 | // memory corruption | 3575 | // memory corruption |
3576 | if (TerrainHeightFieldHeights.ContainsKey(g)) | 3576 | if (TerrainHeightFieldHeights.ContainsKey(g)) |
3577 | { | 3577 | { |
3578 | float[] removingHeightField = TerrainHeightFieldHeights[g]; | 3578 | // float[] removingHeightField = TerrainHeightFieldHeights[g]; |
3579 | TerrainHeightFieldHeights.Remove(g); | 3579 | TerrainHeightFieldHeights.Remove(g); |
3580 | 3580 | ||
3581 | if (RegionTerrain.ContainsKey(g)) | 3581 | if (RegionTerrain.ContainsKey(g)) |