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

Adapt to the core SP rework

avinationmerge
Melanie 2011-11-05 21:53:05 +00:00
parent 0f279b1187
commit 9c6025f928
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,7 +262,7 @@ TrySetMovementAnimation("STAND");
m_animTickFall = Environment.TickCount; m_animTickFall = Environment.TickCount;
} }
// else if (!jumping && fallElapsed > FALL_DELAY) // 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 // Falling long enough to trigger the animation
//Console.WriteLine("FALLDOWN"); //## //Console.WriteLine("FALLDOWN"); //##

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

@ -144,7 +144,11 @@ namespace OpenSim.Region.Framework.Scenes
get { return m_userFlags; } get { return m_userFlags; }
} }
private bool m_flyingOld; // add for fly velocity control 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_lastColCount = -1; //KF: Look for Collision chnages
private int m_updateCount = 0; //KF: Update Anims for a while private int m_updateCount = 0; //KF: Update Anims for a while