From 9b19c65450ae9e4fb79ecc315c96614269485a81 Mon Sep 17 00:00:00 2001
From: diva
Date: Sun, 15 Feb 2009 06:12:11 +0000
Subject: Guarding the new call to SetHeight in MakeRoot, so that ODE doesn't
 complain when it's 0.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 69397eb..d590d99 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -845,7 +845,7 @@ namespace OpenSim.Region.Framework.Scenes
             AbsolutePosition = pos;
 
             AddToPhysicalScene(isFlying);
-            if (m_appearance != null)
+            if ((m_appearance != null) && (m_appearance.AvatarHeight > 0))
                 SetHeight(m_appearance.AvatarHeight);
             
             // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying 
-- 
cgit v1.1