From 312b0f91c4d86787684a46bcd28ee45b431ba9b1 Mon Sep 17 00:00:00 2001
From: diva
Date: Sun, 15 Feb 2009 20:02:13 +0000
Subject: More guards around SetHeight.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0aac6e1..42a429d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1480,7 +1480,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_parentID = 0;
                 SendFullUpdateToAllClients();
                 m_requestedSitTargetID = 0;
-                if (m_physicsActor != null)
+                if ((m_physicsActor != null) && (m_avHeight > 0))
                 {
                     SetHeight(m_avHeight);
                 }
@@ -2241,7 +2241,8 @@ namespace OpenSim.Region.Framework.Scenes
                 AddToPhysicalScene(m_physicsActor.Flying);
             }
             m_appearance.SetAppearance(texture, visualParam);
-            SetHeight(m_appearance.AvatarHeight);
+            if (m_appearance.AvatarHeight > 0)
+                SetHeight(m_appearance.AvatarHeight);
             m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance);
 
             SendAppearanceToAllOtherAgents();
-- 
cgit v1.1