diff options
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
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 e26aef3..461ee3e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -5975,7 +5975,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5975 | flags |= ScriptBaseClass.AGENT_TYPING; | 5975 | flags |= ScriptBaseClass.AGENT_TYPING; |
5976 | } | 5976 | } |
5977 | 5977 | ||
5978 | string agentMovementAnimation = agent.Animator.GetMovementAnimation(); | 5978 | string agentMovementAnimation = agent.Animator.CurrentMovementAnimation; |
5979 | 5979 | ||
5980 | if (agentMovementAnimation == "CROUCH") | 5980 | if (agentMovementAnimation == "CROUCH") |
5981 | { | 5981 | { |