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

remove the check animState == anim for same reasons

avinationmerge
UbitUmarov 2014-09-09 23:30:31 +01:00
parent 4842806ea8
commit 13cb6ef6ef
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13525,25 +13525,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return; return;
UUID animID; UUID animID;
if (animState == anim)
animID = ScriptUtils.GetAssetIdFromItemName(m_host, anim, (int)AssetType.Animation);
if (animID == UUID.Zero)
{ {
animID = UUID.Zero; String animupper = ((string)anim).ToUpperInvariant();
DefaultAvatarAnimations.AnimsUUID.TryGetValue(animupper, out animID);
} }
else
if (animID == UUID.Zero)
{ {
animID = ScriptUtils.GetAssetIdFromItemName(m_host, anim, (int)AssetType.Animation); llShout(ScriptBaseClass.DEBUG_CHANNEL, "Animation not found");
return;
if (animID == UUID.Zero)
{
String animupper = ((string)anim).ToUpperInvariant();
DefaultAvatarAnimations.AnimsUUID.TryGetValue(animupper, out animID);
}
if (animID == UUID.Zero)
{
llShout(ScriptBaseClass.DEBUG_CHANNEL, "Animation not found");
return;
}
} }
presence.SetAnimationOverride(state, animID); presence.SetAnimationOverride(state, animID);