aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorMelanie2011-12-05 17:10:51 +0000
committerMelanie2011-12-05 17:10:51 +0000
commit5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc (patch)
tree537b010672277073530cf013434fa046aabfec7e /OpenSim/Region/ScriptEngine/Shared
parentStrip CR from http responses and limit them to 2048 chars (diff)
parentHG: Added HEAD method to Helo service. This is the preferred method, but its ... (diff)
downloadopensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.zip
opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.gz
opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.bz2
opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.xz
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.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 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 {