diff options
| author | Jonathan Freedman | 2010-10-05 14:17:18 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-05 14:17:18 -0400 |
| commit | 8f1acb890ac49ea004bf43065ce8d3472bb27708 (patch) | |
| tree | 07e4e5fc77f764232c958bdbf8f93f2651da1663 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.zip opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.gz opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.bz2 opensim-SC_OLD-8f1acb890ac49ea004bf43065ce8d3472bb27708.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.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index a4533fa..13d9964 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1523,7 +1523,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1523 | } | 1523 | } |
| 1524 | 1524 | ||
| 1525 | // If the agent update does move the avatar, then calculate the force ready for the velocity update, | 1525 | // If the agent update does move the avatar, then calculate the force ready for the velocity update, |
| 1526 | // which occurs later in the main scene loop | 1526 | // which occurs later in the main scene loop |
| 1527 | if (update_movementflag || (update_rotation && DCFlagKeyPressed)) | 1527 | if (update_movementflag || (update_rotation && DCFlagKeyPressed)) |
| 1528 | { | 1528 | { |
| 1529 | // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); | 1529 | // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); |