Merge branch 'master' of /var/git/opensim/

2010-11-02 18:00:07 -07:00 · 2010-11-02 18:00:07 -07:00 · 87d56ec6ad
parent 732fdbff2a 7d551e27ca
commit 87d56ec6ad
1 changed files with 3 additions and 0 deletions
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@ -3187,6 +3187,9 @@ namespace OpenSim.Region.Framework.Scenes
        /// </summary>
        public void AddToPhysicalScene(bool isFlying)
        {
+            if (m_appearance.AvatarHeight == 0)
+                return;
+
            PhysicsScene scene = m_scene.PhysicsScene;

            Vector3 pVec = AbsolutePosition;