aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2014-09-09 23:22:36 +0100
committerUbitUmarov2014-09-09 23:22:36 +0100
commit4842806ea8c60a967904f4dfee08426f6c53df3f (patch)
treebaba03b132d12af9304887d9012b4fa1ddfc9e60 /OpenSim
parent force update of movement animation (diff)
downloadopensim-SC-4842806ea8c60a967904f4dfee08426f6c53df3f.zip
opensim-SC-4842806ea8c60a967904f4dfee08426f6c53df3f.tar.gz
opensim-SC-4842806ea8c60a967904f4dfee08426f6c53df3f.tar.bz2
opensim-SC-4842806ea8c60a967904f4dfee08426f6c53df3f.tar.xz
look for animation on part inventory before default animations, so
user can use same name. Search directly on default animations using uppercase.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs11
1 files changed, 7 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 9dcdf5b..caf9fca 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -13529,13 +13529,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
13529 { 13529 {
13530 animID = UUID.Zero; 13530 animID = UUID.Zero;
13531 } 13531 }
13532 else if (MovementAnimationsForLSL.ContainsKey(anim))
13533 {
13534 animID = DefaultAvatarAnimations.AnimsUUID[MovementAnimationsForLSL[anim]];
13535 }
13536 else 13532 else
13537 { 13533 {
13538 animID = ScriptUtils.GetAssetIdFromItemName(m_host, anim, (int)AssetType.Animation); 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
13539 if (animID == UUID.Zero) 13542 if (animID == UUID.Zero)
13540 { 13543 {
13541 llShout(ScriptBaseClass.DEBUG_CHANNEL, "Animation not found"); 13544 llShout(ScriptBaseClass.DEBUG_CHANNEL, "Animation not found");