aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorDan Lake2011-11-10 17:21:49 -0800
committerDan Lake2011-11-10 17:21:49 -0800
commit7432ca6daf181368579607fb7f697aed91d36eda (patch)
tree93e3c6d8b9582ae829bc90a58aabcce64621abf4 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentIn SOP, replaced many references to private members with the public properties (diff)
parentPrevent linking objects while they are deeded. On unlinking deeded objects, (diff)
downloadopensim-SC-7432ca6daf181368579607fb7f697aed91d36eda.zip
opensim-SC-7432ca6daf181368579607fb7f697aed91d36eda.tar.gz
opensim-SC-7432ca6daf181368579607fb7f697aed91d36eda.tar.bz2
opensim-SC-7432ca6daf181368579607fb7f697aed91d36eda.tar.xz
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e662492..fdf944b 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1387,6 +1387,11 @@ namespace OpenSim.Region.Framework.Scenes
1387 if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) != 0) 1387 if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) != 0)
1388 m_updateCount = UPDATE_COUNT; 1388 m_updateCount = UPDATE_COUNT;
1389 1389
1390 // Make turning in place work
1391 if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_YAW_POS) != 0 ||
1392 (flags & AgentManager.ControlFlags.AGENT_CONTROL_YAW_NEG) != 0)
1393 m_updateCount = UPDATE_COUNT;
1394
1390 if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) 1395 if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0)
1391 { 1396 {
1392 StandUp(); 1397 StandUp();