* This update includes a wide range of changes to the ODEPlugin for avatar movement, including:

** - avatar can navigate stairs better now
** - avatar can land without shooting into the air
** - excessive collisions with the ground are tempered somewhat and should only shoot the avatar up 20m instead of 200m
** - Try Catched a TextureDownloadModule.cs array out of bounds error with a report that causes it not to crash the sim, however it reports a few important items for tracking it down.

1 files changed, 21 insertions, 18 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 33b2e4f..9676db4 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -111,22 +111,22 @@ namespace OpenSim.Region.Physics.OdePlugin
 
 
 
-                Amotor = d.JointCreateAMotor(parent_scene.world, IntPtr.Zero); 
-                d.JointAttach(Amotor, Body, IntPtr.Zero);
-                d.JointSetAMotorMode(Amotor, dAMotorEuler);
-                d.JointSetAMotorNumAxes(Amotor, 3);
-                d.JointSetAMotorAxis(Amotor, 0, 0, 1, 0, 0);
-                d.JointSetAMotorAxis(Amotor, 1, 0, 0, 1, 0);
-                d.JointSetAMotorAxis(Amotor, 2, 0, 0, 0, 1);
-                d.JointSetAMotorAngle(Amotor, 0, 0);
-                d.JointSetAMotorAngle(Amotor, 1, 0);
-                d.JointSetAMotorAngle(Amotor, 2, 0);
-                d.JointSetAMotorParam(Amotor, 0, -0);
-                d.JointSetAMotorParam(Amotor, 0x200, -0);
-                d.JointSetAMotorParam(Amotor, 0x100, -0);
-                d.JointSetAMotorParam(Amotor, 0, 0);
-                d.JointSetAMotorParam(Amotor, 3, 0);
-                d.JointSetAMotorParam(Amotor, 2, 0);
+                //Amotor = d.JointCreateAMotor(parent_scene.world, IntPtr.Zero); 
+                //d.JointAttach(Amotor, Body, IntPtr.Zero);
+                //d.JointSetAMotorMode(Amotor, dAMotorEuler);
+                //d.JointSetAMotorNumAxes(Amotor, 3);
+                //d.JointSetAMotorAxis(Amotor, 0, 0, 1, 0, 0);
+                //d.JointSetAMotorAxis(Amotor, 1, 0, 0, 1, 0);
+                ///d.JointSetAMotorAxis(Amotor, 2, 0, 0, 0, 1);
+                //d.JointSetAMotorAngle(Amotor, 0, 0);
+                //d.JointSetAMotorAngle(Amotor, 1, 0);
+                //d.JointSetAMotorAngle(Amotor, 2, 0);
+                //d.JointSetAMotorParam(Amotor, 0, -0);
+                //d.JointSetAMotorParam(Amotor, 0x200, -0);
+                //d.JointSetAMotorParam(Amotor, 0x100, -0);
+               // d.JointSetAMotorParam(Amotor, 0, 0);
+               // d.JointSetAMotorParam(Amotor, 3, 0);
+               // d.JointSetAMotorParam(Amotor, 2, 0);
                 
 
                 
@@ -269,7 +269,10 @@ namespace OpenSim.Region.Physics.OdePlugin
                     m_pidControllerActive = true;
             }
         }
-
+        public void SetPidStatus(bool status)
+        {
+            m_pidControllerActive = status;
+        }
         public override PhysicsVector Position
         {
             get { return _position; }
@@ -583,7 +586,7 @@ namespace OpenSim.Region.Physics.OdePlugin
         {
             lock (OdeScene.OdeLock)
             {
-                d.JointDestroy(Amotor);
+               // d.JointDestroy(Amotor);
                 d.GeomDestroy(Shell);
                 _parent_scene.geom_name_map.Remove(Shell);
                 d.BodyDestroy(Body);