diff options
author | Justin Clark-Casey (justincc) | 2012-10-26 23:10:52 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-10-26 23:10:52 +0100 |
commit | cc204497e08c79f47a8cdd642ca14090f8718e07 (patch) | |
tree | a1d8c01e8071242c36c9f2aef395918703feff89 /OpenSim/Region/ScriptEngine | |
parent | Fix "save iar" hanging permanently if the asset request phase times out. (diff) | |
parent | Separate LSL's notion of the default anim from the actually playing anims. (diff) | |
download | opensim-SC_OLD-cc204497e08c79f47a8cdd642ca14090f8718e07.zip opensim-SC_OLD-cc204497e08c79f47a8cdd642ca14090f8718e07.tar.gz opensim-SC_OLD-cc204497e08c79f47a8cdd642ca14090f8718e07.tar.bz2 opensim-SC_OLD-cc204497e08c79f47a8cdd642ca14090f8718e07.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index dc791d3..fa57845 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -4388,7 +4388,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4388 | { | 4388 | { |
4389 | AnimationSet currentAnims = presence.Animator.Animations; | 4389 | AnimationSet currentAnims = presence.Animator.Animations; |
4390 | string currentAnimationState = String.Empty; | 4390 | string currentAnimationState = String.Empty; |
4391 | if (animationstateNames.TryGetValue(currentAnims.DefaultAnimation.AnimID, out currentAnimationState)) | 4391 | if (animationstateNames.TryGetValue(currentAnims.ImplicitDefaultAnimation.AnimID, out currentAnimationState)) |
4392 | return currentAnimationState; | 4392 | return currentAnimationState; |
4393 | } | 4393 | } |
4394 | } | 4394 | } |
@@ -5705,7 +5705,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5705 | flags |= ScriptBaseClass.AGENT_SITTING; | 5705 | flags |= ScriptBaseClass.AGENT_SITTING; |
5706 | } | 5706 | } |
5707 | 5707 | ||
5708 | if (agent.Animator.Animations.DefaultAnimation.AnimID | 5708 | if (agent.Animator.Animations.ImplicitDefaultAnimation.AnimID |
5709 | == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) | 5709 | == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) |
5710 | { | 5710 | { |
5711 | flags |= ScriptBaseClass.AGENT_SITTING; | 5711 | flags |= ScriptBaseClass.AGENT_SITTING; |
@@ -7892,7 +7892,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7892 | { | 7892 | { |
7893 | LSL_Vector lower; | 7893 | LSL_Vector lower; |
7894 | LSL_Vector upper; | 7894 | LSL_Vector upper; |
7895 | if (presence.Animator.Animations.DefaultAnimation.AnimID | 7895 | if (presence.Animator.Animations.ImplicitDefaultAnimation.AnimID |
7896 | == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) | 7896 | == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) |
7897 | { | 7897 | { |
7898 | // This is for ground sitting avatars | 7898 | // This is for ground sitting avatars |