From f0b149dfc163dac527964d13bf1920f0af016a14 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Fri, 4 Jan 2008 04:09:18 +0000
Subject: * Fixed situation where sometimes your avatar tries to land and gets
 'put' 80 meters into the air immediately.

---
 OpenSim/Region/Environment/Scenes/ScenePresence.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 3aa9583..a8042d4 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -553,7 +553,14 @@ namespace OpenSim.Region.Environment.Scenes
             // Add 1/6 the avatar's height to it's position so it doesn't shoot into the air
             // when the avatar stands up
 
-            AbsolutePosition = AbsolutePosition + new LLVector3(0, 0, (m_avHeight/6));
+            if (m_avHeight != 127.0f)
+            {
+                AbsolutePosition = AbsolutePosition + new LLVector3(0, 0, (m_avHeight / 6));
+            }
+            else
+            {
+                AbsolutePosition = AbsolutePosition + new LLVector3(0, 0, (1.56f / 6));
+            }
             SetMovementAnimation(Animations.AnimsLLUUID["LAND"], 2);
             SendFullUpdateToAllClients();
         }
-- 
cgit v1.1