aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs18
1 files changed, 9 insertions, 9 deletions
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
797 { 797 {
798 StandUp(); 798 StandUp();
799 } 799 }
800 lock (scriptedcontrols)
801 {
802 if (scriptedcontrols.Count > 0)
803 {
804 SendControlToScripts(flags, LastCommands);
805 flags = this.RemoveIgnoredControls(flags, IgnoredControls);
800 806
807 }
808 }
801 if (PhysicsActor == null) 809 if (PhysicsActor == null)
802 { 810 {
803 return; 811 return;
@@ -817,15 +825,7 @@ namespace OpenSim.Region.Environment.Scenes
817 // m_state = agentData.AgentData.State; 825 // m_state = agentData.AgentData.State;
818 826
819 827
820 lock (scriptedcontrols) 828
821 {
822 if (scriptedcontrols.Count > 0)
823 {
824 SendControlToScripts(flags, LastCommands);
825 flags = this.RemoveIgnoredControls(flags, IgnoredControls);
826
827 }
828 }
829 829
830 830
831 if (m_allowMovement) 831 if (m_allowMovement)