diff options
| author | Melanie | 2010-10-06 00:27:10 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-06 00:27:10 +0100 |
| commit | d8149373c15d9ec39c0f836a337e58b633f45829 (patch) | |
| tree | 3678027b5eb7f1cdfb29b1c0c80bd0c3d7a62ae6 /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
| parent | Avoid throwing errors when adding existing meshes to the render scene (diff) | |
| parent | Remove sirikata project (diff) | |
| download | opensim-SC_OLD-d8149373c15d9ec39c0f836a337e58b633f45829.zip opensim-SC_OLD-d8149373c15d9ec39c0f836a337e58b633f45829.tar.gz opensim-SC_OLD-d8149373c15d9ec39c0f836a337e58b633f45829.tar.bz2 opensim-SC_OLD-d8149373c15d9ec39c0f836a337e58b633f45829.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
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 ec3f004..618f425 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1666,7 +1666,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1666 | } | 1666 | } |
| 1667 | 1667 | ||
| 1668 | // If the agent update does move the avatar, then calculate the force ready for the velocity update, | 1668 | // If the agent update does move the avatar, then calculate the force ready for the velocity update, |
| 1669 | // which occurs later in the main scene loop | 1669 | // which occurs later in the main scene loop |
| 1670 | if (update_movementflag || (update_rotation && DCFlagKeyPressed)) | 1670 | if (update_movementflag || (update_rotation && DCFlagKeyPressed)) |
| 1671 | { | 1671 | { |
| 1672 | // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); | 1672 | // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); |