aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Animation
diff options
context:
space:
mode:
authorMelanie2011-12-09 08:13:57 +0000
committerMelanie2011-12-09 08:13:57 +0000
commitd9133038755180da5378729985b2aca6dc33b425 (patch)
treef70530bacb9b22d6f2f20ec8dfa7e1dd9b755f2b /OpenSim/Region/Framework/Scenes/Animation
parentMerge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster int... (diff)
parentRevert "Revert "Stop performing the asset save part of baked texture uploadin... (diff)
downloadopensim-SC-d9133038755180da5378729985b2aca6dc33b425.zip
opensim-SC-d9133038755180da5378729985b2aca6dc33b425.tar.gz
opensim-SC-d9133038755180da5378729985b2aca6dc33b425.tar.bz2
opensim-SC-d9133038755180da5378729985b2aca6dc33b425.tar.xz
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 43cfd80..eda085f 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
60 public int m_animTickJump; // ScenePresence has to see this to control +Z force 60 public int m_animTickJump; // ScenePresence has to see this to control +Z force
61 public bool m_jumping = false; 61 public bool m_jumping = false;
62 public float m_jumpVelocity = 0f; 62 public float m_jumpVelocity = 0f;
63 private int m_landing = 0; 63// private int m_landing = 0;
64 public bool Falling 64 public bool Falling
65 { 65 {
66 get { return m_falling; } 66 get { return m_falling; }