aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
diff options
context:
space:
mode:
authorBlueWall2011-12-02 20:21:35 -0500
committerBlueWall2011-12-02 20:21:35 -0500
commitb94ab10922f65237546c4a9bf56af3544f9c3257 (patch)
tree57fd17350743352ecbb29dcbe54948de1064b703 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
parentMerge branch 'master' of /home/opensim/var/repo/opensim (diff)
parentrefactor: Use just ScenePresenceAnimator.CurrentMovementAnimation rather than... (diff)
downloadopensim-SC_OLD-b94ab10922f65237546c4a9bf56af3544f9c3257.zip
opensim-SC_OLD-b94ab10922f65237546c4a9bf56af3544f9c3257.tar.gz
opensim-SC_OLD-b94ab10922f65237546c4a9bf56af3544f9c3257.tar.bz2
opensim-SC_OLD-b94ab10922f65237546c4a9bf56af3544f9c3257.tar.xz
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 6c54c9b..6c418df 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5554,7 +5554,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5554 flags |= ScriptBaseClass.AGENT_TYPING; 5554 flags |= ScriptBaseClass.AGENT_TYPING;
5555 } 5555 }
5556 5556
5557 string agentMovementAnimation = agent.Animator.GetMovementAnimation(); 5557 string agentMovementAnimation = agent.Animator.CurrentMovementAnimation;
5558 5558
5559 if (agentMovementAnimation == "CROUCH") 5559 if (agentMovementAnimation == "CROUCH")
5560 { 5560 {