OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change m_falling public to a getter property.

avinationmerge
Melanie 2011-11-05 22:05:27 +00:00
parent 9c6025f928
commit 8fb6ae379a
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
View File

@ -66,7 +66,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation
public bool m_jumping = false; // Add for jumping public bool m_jumping = false; // Add for jumping
public float m_jumpVelocity = 0f; // Add for jumping public float m_jumpVelocity = 0f; // Add for jumping
private int m_landing = 0; // Add for jumping private int m_landing = 0; // Add for jumping
public bool m_falling = false; // Add for falling public bool Falling
{
get { return m_falling; }
}
private bool m_falling = false; // Add for falling
private float m_fallHeight; // Add for falling private float m_fallHeight; // Add for falling
/// <value> /// <value>

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -2479,7 +2479,7 @@ namespace OpenSim.Region.Framework.Scenes
// m_log.Info("[AGENT]: Stop Flying"); // m_log.Info("[AGENT]: Stop Flying");
//} //}
} }
if (Animator.m_falling && m_wasFlying) // if falling from flying, disable motion add if (Animator.Falling && m_wasFlying) // if falling from flying, disable motion add
{ {
direc *= 0.0f; direc *= 0.0f;
} }