diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 1417efb..1370afc 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -1650,7 +1650,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1650 | ScenePresence avatar = m_scene.GetScenePresence(rootpart.AttachedAvatar); | 1650 | ScenePresence avatar = m_scene.GetScenePresence(rootpart.AttachedAvatar); |
1651 | if (avatar != null) | 1651 | if (avatar != null) |
1652 | { | 1652 | { |
1653 | avatar.DoMoveToPosition(0, target, null); | 1653 | avatar.DoMoveToPosition(target); |
1654 | } | 1654 | } |
1655 | } | 1655 | } |
1656 | else | 1656 | else |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 9558258..19b7f19 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1537,8 +1537,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1537 | } | 1537 | } |
1538 | 1538 | ||
1539 | /// <summary> | 1539 | /// <summary> |
1540 | /// Process moving the avatar if a position has been set. | 1540 | /// Process move to update for an avatar. |
1541 | /// </summary> | 1541 | /// </summary> |
1542 | /// <remarks> | ||
1543 | /// This doesn't actually perform the movement. Instead, it adds its vector to agent_control_v3 | ||
1544 | /// </remarks> | ||
1542 | /// <param value="agent_control_v3">Cumulative agent movement that this method will update.</param> | 1545 | /// <param value="agent_control_v3">Cumulative agent movement that this method will update.</param> |
1543 | /// <param value="bodyRotation">New body rotation of the avatar.</param> | 1546 | /// <param value="bodyRotation">New body rotation of the avatar.</param> |
1544 | /// <param value="reset">If true, clear the move to position</param> | 1547 | /// <param value="reset">If true, clear the move to position</param> |
@@ -1698,7 +1701,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1698 | /// Move this presence to the given position over time. | 1701 | /// Move this presence to the given position over time. |
1699 | /// </summary> | 1702 | /// </summary> |
1700 | /// <param name="pos"></param> | 1703 | /// <param name="pos"></param> |
1701 | public void DoMoveToPosition(uint not_used, Vector3 pos, IClientAPI remote_client) | 1704 | public void DoMoveToPosition(Vector3 pos) |
1702 | { | 1705 | { |
1703 | // m_log.DebugFormat( | 1706 | // m_log.DebugFormat( |
1704 | // "[SCENE PRESENCE]: Avatar {0} received request to move to position {1} in {2}", | 1707 | // "[SCENE PRESENCE]: Avatar {0} received request to move to position {1} in {2}", |