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

Make WALK animation state work again. TURNLEFT and TURNRIGHT are now rebroken

avinationmerge
Melanie 2011-10-12 07:46:13 +02:00
parent e3effc4974
commit 1d379a9c7b
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -404,7 +404,12 @@ TrySetMovementAnimation("STAND");
else if (m_scenePresence.SetAlwaysRun) else if (m_scenePresence.SetAlwaysRun)
return "RUN"; return "RUN";
else else
return "WALK";
}
// rm for jumping else
else if (!m_jumping) // add for jumping
{ {
m_falling = false; // Add for falling
// Not walking // Not walking
if (move.Z < 0) if (move.Z < 0)
return "CROUCH"; return "CROUCH";
@ -412,17 +417,6 @@ TrySetMovementAnimation("STAND");
return "TURNLEFT"; return "TURNLEFT";
else if (heldTurnRight) else if (heldTurnRight)
return "TURNRIGHT"; return "TURNRIGHT";
else
return "WALK";
}
}
// rm for jumping else
else if (!m_jumping) // add for jumping
{
m_falling = false; // Add for falling
// Not walking
if (move.Z < 0f)
return "CROUCH";
else else
return "STAND"; return "STAND";
} }