From 2c2b340afe9447ab68aac4b6fec1bab91478e2d1 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 27 Dec 2022 18:14:13 +0000 Subject: [PATCH] mantis 4092: apply patch, wit a change, to llstopanimation --- .../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index fcdc6a8ec1..eea07168dd 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -4186,11 +4186,12 @@ 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 (presence.TryGetAnimationOverride(anim.ToUpper(), out UUID sitanimID)) + presence.Animator.RemoveAnimation(sitanimID, true); + else + presence.Animator.RemoveAnimation(anim); } } }