Merge branch 'master' into bigmerge

Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
author: Melanie 2011-12-05 17:10:51 +0000
committer: Melanie 2011-12-05 17:10:51 +0000
commit: 5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc (patch)
tree: 537b010672277073530cf013434fa046aabfec7e /OpenSim/Region/ScriptEngine/Shared
parent: Strip CR from http responses and limit them to 2048 chars (diff)
parent: HG: Added HEAD method to Helo service. This is the preferred method, but its ... (diff)
download: opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.zip
opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.gz
opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.bz2
opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.xz
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
                flags |= ScriptBaseClass.AGENT_TYPING;
            }
-            string agentMovementAnimation = agent.Animator.GetMovementAnimation();
+            string agentMovementAnimation = agent.Animator.CurrentMovementAnimation;
            if (agentMovementAnimation == "CROUCH")
            {
author	Melanie	2011-12-05 17:10:51 +0000
committer	Melanie	2011-12-05 17:10:51 +0000
commit	5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc (patch)
tree	537b010672277073530cf013434fa046aabfec7e /OpenSim/Region/ScriptEngine/Shared
parent	Strip CR from http responses and limit them to 2048 chars (diff)
parent	HG: Added HEAD method to Helo service. This is the preferred method, but its ... (diff)
download	opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.zip opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.gz opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.bz2 opensim-SC_OLD-5ab536a1e92a9a50212cbc8e301ef9ac611fe9dc.tar.xz

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	{