diff options
author | Justin Clarke Casey | 2008-11-05 15:26:10 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-05 15:26:10 +0000 |
commit | 8f3c5dbe5c072b540ae446ddf57bf654c9f135d6 (patch) | |
tree | 0cd1befb3233ce59fc38398002e5cec5995b3451 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
parent | Update svn properties, minor formatting cleanup. (diff) | |
download | opensim-SC_OLD-8f3c5dbe5c072b540ae446ddf57bf654c9f135d6.zip opensim-SC_OLD-8f3c5dbe5c072b540ae446ddf57bf654c9f135d6.tar.gz opensim-SC_OLD-8f3c5dbe5c072b540ae446ddf57bf654c9f135d6.tar.bz2 opensim-SC_OLD-8f3c5dbe5c072b540ae446ddf57bf654c9f135d6.tar.xz |
* Apply second patch in http://opensimulator.org/mantis/view.php?id=2561
* Inserts proper animation state names into data/avataranimations.xml file so that llGetAnimation() works as one would expect.
* Thanks StrawberryFride!
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 |
1 files changed, 4 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 778cf9f..eefb8e6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3486,14 +3486,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3486 | ScenePresence presence = World.GetScenePresence(avatar); | 3486 | ScenePresence presence = World.GetScenePresence(avatar); |
3487 | if (m_host.RegionHandle == presence.RegionHandle) | 3487 | if (m_host.RegionHandle == presence.RegionHandle) |
3488 | { | 3488 | { |
3489 | Dictionary<UUID, string> animationNames = AnimationSet.Animations.AnimsNames; | 3489 | Dictionary<UUID, string> animationstateNames = AnimationSet.Animations.AnimStateNames; |
3490 | 3490 | ||
3491 | if (presence != null) | 3491 | if (presence != null) |
3492 | { | 3492 | { |
3493 | AnimationSet currentAnims = presence.Animations; | 3493 | AnimationSet currentAnims = presence.Animations; |
3494 | string currentAnimation = String.Empty; | 3494 | string currentAnimationState = String.Empty; |
3495 | if (animationNames.TryGetValue(currentAnims.DefaultAnimation.AnimID, out currentAnimation)) | 3495 | if (animationstateNames.TryGetValue(currentAnims.DefaultAnimation.AnimID, out currentAnimationState)) |
3496 | return currentAnimation; | 3496 | return currentAnimationState; |
3497 | } | 3497 | } |
3498 | } | 3498 | } |
3499 | return String.Empty; | 3499 | return String.Empty; |