From 8cebc84de70e0b794fbe1fb3264a7ee3f2969b2c Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 2 Jun 2020 18:05:22 +0100 Subject: [PATCH] let objects use default animations --- .../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index f5ec447ab4..ba842f68ec 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -4195,14 +4195,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api // Do NOT try to parse UUID, animations cannot be triggered by ID UUID animID = ScriptUtils.GetAssetIdFromItemName(m_host, anim, (int)AssetType.Animation); if (animID == UUID.Zero) - return; - m_host.AddAnimation(animID, anim); + animID = DefaultAvatarAnimations.GetDefaultAnimation(anim); + if (animID != UUID.Zero) + m_host.AddAnimation(animID, anim); } public void llStopObjectAnimation(string anim) { m_host.AddScriptLPS(1); UUID animID = ScriptUtils.GetAssetIdFromKeyOrItemName(m_host, anim, AssetType.Animation); + if (animID == UUID.Zero) + animID = DefaultAvatarAnimations.GetDefaultAnimation(anim); if (animID != UUID.Zero) m_host.RemoveAnimation(animID); }