diff options
author | Justin Clarke Casey | 2008-11-26 17:30:47 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-26 17:30:47 +0000 |
commit | 759850cbc179cb711ff0e04d0dd882753f11252e (patch) | |
tree | c81ef4c6536b9dadfacf2c9888ea0fbd37f96fbf /OpenSim/Region/Environment/Scenes | |
parent | * Get rid of the phenomena where the avatar sometimes reverts to the stand an... (diff) | |
download | opensim-SC-759850cbc179cb711ff0e04d0dd882753f11252e.zip opensim-SC-759850cbc179cb711ff0e04d0dd882753f11252e.tar.gz opensim-SC-759850cbc179cb711ff0e04d0dd882753f11252e.tar.bz2 opensim-SC-759850cbc179cb711ff0e04d0dd882753f11252e.tar.xz |
* Eliminate forceAvatarMovement() in favour of existing AddNewMovement()
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index c32691f..f6b0f68 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -721,11 +721,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
721 | m_scene.AddAgentTime(System.Environment.TickCount - m_perfMonMS); | 721 | m_scene.AddAgentTime(System.Environment.TickCount - m_perfMonMS); |
722 | } | 722 | } |
723 | 723 | ||
724 | public void forceAvatarMovement(Vector3 position, Quaternion rotation) | ||
725 | { | ||
726 | AddNewMovement(position, rotation); | ||
727 | } | ||
728 | |||
729 | #region Status Methods | 724 | #region Status Methods |
730 | 725 | ||
731 | /// <summary> | 726 | /// <summary> |
@@ -1666,9 +1661,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
1666 | } | 1661 | } |
1667 | 1662 | ||
1668 | /// <summary> | 1663 | /// <summary> |
1669 | /// Adds a new movement | 1664 | /// Rotate the avatar to the given rotation and apply a movement in the given relative vector |
1670 | /// </summary> | 1665 | /// </summary> |
1671 | protected void AddNewMovement(Vector3 vec, Quaternion rotation) | 1666 | /// <param name="vec">The vector in which to move. This is relative to the rotation argument</param> |
1667 | /// <param name="rotation">The direction in which this avatar should now face. | ||
1668 | public void AddNewMovement(Vector3 vec, Quaternion rotation) | ||
1672 | { | 1669 | { |
1673 | if (m_isChildAgent) | 1670 | if (m_isChildAgent) |
1674 | { | 1671 | { |