diff options
author | Melanie | 2011-11-05 22:05:27 +0000 |
---|---|---|
committer | Melanie | 2011-11-05 22:05:27 +0000 |
commit | 8fb6ae379ae830da0b52b1825ec74fbcded5981b (patch) | |
tree | 9a1e6596d47fba987abad7de2d870f4195f8bbfa | |
parent | Adapt to the core SP rework (diff) | |
download | opensim-SC-8fb6ae379ae830da0b52b1825ec74fbcded5981b.zip opensim-SC-8fb6ae379ae830da0b52b1825ec74fbcded5981b.tar.gz opensim-SC-8fb6ae379ae830da0b52b1825ec74fbcded5981b.tar.bz2 opensim-SC-8fb6ae379ae830da0b52b1825ec74fbcded5981b.tar.xz |
Change m_falling public to a getter property.
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index cc96b24..c39f34f 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
@@ -66,7 +66,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
66 | public bool m_jumping = false; // Add for jumping | 66 | public bool m_jumping = false; // Add for jumping |
67 | public float m_jumpVelocity = 0f; // Add for jumping | 67 | public float m_jumpVelocity = 0f; // Add for jumping |
68 | private int m_landing = 0; // Add for jumping | 68 | private int m_landing = 0; // Add for jumping |
69 | public bool m_falling = false; // Add for falling | 69 | public bool Falling |
70 | { | ||
71 | get { return m_falling; } | ||
72 | } | ||
73 | private bool m_falling = false; // Add for falling | ||
70 | private float m_fallHeight; // Add for falling | 74 | private float m_fallHeight; // Add for falling |
71 | 75 | ||
72 | /// <value> | 76 | /// <value> |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index cca55be..1067b9d 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2479,7 +2479,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2479 | // m_log.Info("[AGENT]: Stop Flying"); | 2479 | // m_log.Info("[AGENT]: Stop Flying"); |
2480 | //} | 2480 | //} |
2481 | } | 2481 | } |
2482 | if (Animator.m_falling && m_wasFlying) // if falling from flying, disable motion add | 2482 | if (Animator.Falling && m_wasFlying) // if falling from flying, disable motion add |
2483 | { | 2483 | { |
2484 | direc *= 0.0f; | 2484 | direc *= 0.0f; |
2485 | } | 2485 | } |