diff options
| author | Justin Clark-Casey (justincc) | 2011-11-11 19:40:31 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-11-11 19:40:31 +0000 |
| commit | 8f4955f6a94c09209cd76ee8141ed3c9b9753bc2 (patch) | |
| tree | 00868b46e74b8b43261964eb8a0e3b65b6b84781 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Add new ScenePresenceSitTests with a single sit/stand test (diff) | |
| parent | one more jenkins test! (diff) | |
| download | opensim-SC_OLD-8f4955f6a94c09209cd76ee8141ed3c9b9753bc2.zip opensim-SC_OLD-8f4955f6a94c09209cd76ee8141ed3c9b9753bc2.tar.gz opensim-SC_OLD-8f4955f6a94c09209cd76ee8141ed3c9b9753bc2.tar.bz2 opensim-SC_OLD-8f4955f6a94c09209cd76ee8141ed3c9b9753bc2.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
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(); |