mirror of
https://github.com/opensim/opensim.git
synced 2026-08-06 01:06:30 +08:00
Mantis 9042 allow llStopAnimation with overridden animations
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
This commit is contained in:
@@ -4167,11 +4167,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||
if (presence != null)
|
||||
{
|
||||
UUID animID = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, anim);
|
||||
|
||||
if (animID.IsZero())
|
||||
presence.Animator.RemoveAnimation(anim);
|
||||
else
|
||||
if (animID.IsNotZero())
|
||||
presence.Animator.RemoveAnimation(animID, true);
|
||||
else if (MovementAnimationsForLSL.TryGetValue(anim.ToUpper(), out string lslMovementAnimation))
|
||||
{
|
||||
if (presence.TryGetAnimationOverride(anim.ToUpper(), out UUID sitanimID))
|
||||
presence.Animator.RemoveAnimation(sitanimID, true);
|
||||
}
|
||||
else
|
||||
presence.Animator.RemoveAnimation(anim);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user