From 28e6e018a22123015d6911485def68d252ec23d8 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Wed, 7 May 2008 21:50:37 +0000 Subject: * Doh! scripts that get controls should get controls even when you're sitting on an object. --- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes') diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 9732d05..052b85a 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -797,7 +797,15 @@ namespace OpenSim.Region.Environment.Scenes { StandUp(); } + lock (scriptedcontrols) + { + if (scriptedcontrols.Count > 0) + { + SendControlToScripts(flags, LastCommands); + flags = this.RemoveIgnoredControls(flags, IgnoredControls); + } + } if (PhysicsActor == null) { return; @@ -817,15 +825,7 @@ namespace OpenSim.Region.Environment.Scenes // m_state = agentData.AgentData.State; - lock (scriptedcontrols) - { - if (scriptedcontrols.Count > 0) - { - SendControlToScripts(flags, LastCommands); - flags = this.RemoveIgnoredControls(flags, IgnoredControls); - - } - } + if (m_allowMovement) -- cgit v1.1