aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 2cb7e43..e947dc7 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Physics.OdePlugin
55 } 55 }
56 public class OdeCharacter : PhysicsActor 56 public class OdeCharacter : PhysicsActor
57 { 57 {
58 //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 58 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
59 59
60 private PhysicsVector _position; 60 private PhysicsVector _position;
61 private d.Vector3 _zeroPosition; 61 private d.Vector3 _zeroPosition;
@@ -145,7 +145,8 @@ namespace OpenSim.Region.Physics.OdePlugin
145 { 145 {
146 m_colliderarr[i] = false; 146 m_colliderarr[i] = false;
147 } 147 }
148 CAPSULE_LENGTH = (size.Z - ((size.Z * height_fudge_factor))); 148 CAPSULE_LENGTH = (size.Z * 1.15f) - CAPSULE_RADIUS * 2.0f;
149 //m_log.Info("[SIZE]: " + CAPSULE_LENGTH.ToString());
149 150
150 lock (_parent_scene.OdeLock) 151 lock (_parent_scene.OdeLock)
151 { 152 {
@@ -395,7 +396,7 @@ namespace OpenSim.Region.Physics.OdePlugin
395 // float capsuleradius = CAPSULE_RADIUS; 396 // float capsuleradius = CAPSULE_RADIUS;
396 //capsuleradius = 0.2f; 397 //capsuleradius = 0.2f;
397 398
398 CAPSULE_LENGTH = (SetSize.Z - ((SetSize.Z * heightFudgeFactor))); // subtract 43% of the size 399 CAPSULE_LENGTH = (SetSize.Z * 1.15f) - CAPSULE_RADIUS * 2.0f;
399 //m_log.Info("[SIZE]: " + CAPSULE_LENGTH.ToString()); 400 //m_log.Info("[SIZE]: " + CAPSULE_LENGTH.ToString());
400 d.BodyDestroy(Body); 401 d.BodyDestroy(Body);
401 402