diff options
author | UbitUmarov | 2014-09-09 23:30:31 +0100 |
---|---|---|
committer | UbitUmarov | 2014-09-09 23:30:31 +0100 |
commit | 13cb6ef6ef8618f56e4c7a7609bee97ab5fea25a (patch) | |
tree | 7392df2bed5b5475a39735a03df6ad5223b116fe | |
parent | look for animation on part inventory before default animations, so (diff) | |
download | opensim-SC_OLD-13cb6ef6ef8618f56e4c7a7609bee97ab5fea25a.zip opensim-SC_OLD-13cb6ef6ef8618f56e4c7a7609bee97ab5fea25a.tar.gz opensim-SC_OLD-13cb6ef6ef8618f56e4c7a7609bee97ab5fea25a.tar.bz2 opensim-SC_OLD-13cb6ef6ef8618f56e4c7a7609bee97ab5fea25a.tar.xz |
remove the check animState == anim for same reasons
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index caf9fca..b00dbbf 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -13525,25 +13525,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
13525 | return; | 13525 | return; |
13526 | 13526 | ||
13527 | UUID animID; | 13527 | UUID animID; |
13528 | if (animState == anim) | 13528 | |
13529 | animID = ScriptUtils.GetAssetIdFromItemName(m_host, anim, (int)AssetType.Animation); | ||
13530 | |||
13531 | if (animID == UUID.Zero) | ||
13529 | { | 13532 | { |
13530 | animID = UUID.Zero; | 13533 | String animupper = ((string)anim).ToUpperInvariant(); |
13534 | DefaultAvatarAnimations.AnimsUUID.TryGetValue(animupper, out animID); | ||
13531 | } | 13535 | } |
13532 | else | ||
13533 | { | ||
13534 | animID = ScriptUtils.GetAssetIdFromItemName(m_host, anim, (int)AssetType.Animation); | ||
13535 | |||
13536 | if (animID == UUID.Zero) | ||
13537 | { | ||
13538 | String animupper = ((string)anim).ToUpperInvariant(); | ||
13539 | DefaultAvatarAnimations.AnimsUUID.TryGetValue(animupper, out animID); | ||
13540 | } | ||
13541 | 13536 | ||
13542 | if (animID == UUID.Zero) | 13537 | if (animID == UUID.Zero) |
13543 | { | 13538 | { |
13544 | llShout(ScriptBaseClass.DEBUG_CHANNEL, "Animation not found"); | 13539 | llShout(ScriptBaseClass.DEBUG_CHANNEL, "Animation not found"); |
13545 | return; | 13540 | return; |
13546 | } | ||
13547 | } | 13541 | } |
13548 | 13542 | ||
13549 | presence.SetAnimationOverride(state, animID); | 13543 | presence.SetAnimationOverride(state, animID); |