diff options
Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge
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 e0ec7c9..dee9bc3 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3662,7 +3662,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3662 | /// <summary> | 3662 | /// <summary> |
| 3663 | /// Handles part of the PID controller function for moving an avatar. | 3663 | /// Handles part of the PID controller function for moving an avatar. |
| 3664 | /// </summary> | 3664 | /// </summary> |
| 3665 | public override void UpdateMovement() | 3665 | public void UpdateMovement() |
| 3666 | { | 3666 | { |
| 3667 | if (m_forceToApply.HasValue) | 3667 | if (m_forceToApply.HasValue) |
| 3668 | { | 3668 | { |