From 9c6025f928302b0242aa1887071e5e3f96bae90e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sat, 5 Nov 2011 21:53:05 +0000
Subject: Adapt to the core SP rework

---
 OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | 2 +-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs                   | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 175e8ed..cc96b24 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -262,7 +262,7 @@ TrySetMovementAnimation("STAND");
                     m_animTickFall = Environment.TickCount;
                 }
 //                else if (!jumping && fallElapsed > FALL_DELAY)
-                else if (!m_jumping && (fallElapsed > FALL_DELAY) && (fallVelocity < -3.0f) && (m_scenePresence.m_wasFlying)) // add for falling and jumping
+                else if (!m_jumping && (fallElapsed > FALL_DELAY) && (fallVelocity < -3.0f) && (m_scenePresence.WasFlying)) // add for falling and jumping
                 {
                     // Falling long enough to trigger the animation
 //Console.WriteLine("FALLDOWN");  //##
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a1fc1c0..cca55be 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -144,7 +144,11 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_userFlags; }
         }
         private bool m_flyingOld;		// add for fly velocity control
-        public bool m_wasFlying;		// add for fly velocity control
+        public bool WasFlying
+        {
+            get { return m_wasFlying; }
+        }
+        private bool m_wasFlying;		// add for fly velocity control
 
         private int m_lastColCount = -1;		//KF: Look for Collision chnages
         private int m_updateCount = 0;			//KF: Update Anims for a while
-- 
cgit v1.1