Remove duplicated avatar height calculation in lsl functions.

Use height calculation in Basic Physics and Physics of Simplicity so that avatars larger than the default walk with straight legs and shorter walk on the ground.

1 files changed, 19 insertions, 11 deletions

diff --git a/OpenSim/Region/Physics/POSPlugin/POSScene.cs b/OpenSim/Region/Physics/POSPlugin/POSScene.cs
index 9771a62..9a4e92f 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSScene.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSScene.cs
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Physics.POSPlugin
                 float terrainheight = _heightMap[(int)character.Position.Y * Constants.RegionSize + (int)character.Position.X];
                 if (character.Position.Z + (character._target_velocity.Z * timeStep) < terrainheight + 2)
                 {
-                    character.Position.Z = terrainheight + 1.0f;
+                    character.Position.Z = terrainheight + character.Size.Z;
                     forcedZ = true;
                 }
                 else
@@ -184,23 +184,31 @@ namespace OpenSim.Region.Physics.POSPlugin
                     character.Position.Z = oldposZ; //  first try Z axis
                     if (isCollidingWithPrim(character))
                     {
-                        character.Position.Z = oldposZ + 0.4f; // try harder
+                        character.Position.Z = oldposZ + character.Size.Z / 4.4f; // try harder
                         if (isCollidingWithPrim(character))
                         {
-                            character.Position.X = oldposX;
-                            character.Position.Y = oldposY;
-                            character.Position.Z = oldposZ;
-
-                            character.Position.X += character._target_velocity.X * timeStep;
+                            character.Position.Z = oldposZ + character.Size.Z / 2.2f; // try very hard
                             if (isCollidingWithPrim(character))
                             {
                                 character.Position.X = oldposX;
+                                character.Position.Y = oldposY;
+                                character.Position.Z = oldposZ;
+
+                                character.Position.X += character._target_velocity.X * timeStep;
+                                if (isCollidingWithPrim(character))
+                                {
+                                    character.Position.X = oldposX;
+                                }
+
+                                character.Position.Y += character._target_velocity.Y * timeStep;
+                                if (isCollidingWithPrim(character))
+                                {
+                                    character.Position.Y = oldposY;
+                                }
                             }
-
-                            character.Position.Y += character._target_velocity.Y * timeStep;
-                            if (isCollidingWithPrim(character))
+                            else
                             {
-                                character.Position.Y = oldposY;
+                                forcedZ = true;
                             }
                         }
                         else