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

Also check standard anim names

avinationmerge
Melanie Thielker 2014-09-09 03:31:04 +02:00
parent e775e1a317
commit 5376d0a97b
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -13510,11 +13510,23 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (presence == null) if (presence == null)
return; return;
UUID animID = ScriptUtils.GetAssetIdFromItemName(m_host, anim, (int)AssetType.Animation); UUID animID;
if (animID == UUID.Zero) if (animState == anim)
{ {
llShout(ScriptBaseClass.DEBUG_CHANNEL, "Animation not found"); animID = UUID.Zero;
return; }
else if (MovementAnimationsForLSL.ContainsKey(anim))
{
animID = DefaultAvatarAnimations.AnimsUUID[MovementAnimationsForLSL[anim]];
}
else
{
animID = ScriptUtils.GetAssetIdFromItemName(m_host, anim, (int)AssetType.Animation);
if (animID == UUID.Zero)
{
llShout(ScriptBaseClass.DEBUG_CHANNEL, "Animation not found");
return;
}
} }
presence.SetAnimationOverride(state, animID); presence.SetAnimationOverride(state, animID);