diff options
Diffstat (limited to '')
7 files changed, 24 insertions, 37 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index bb491a1..4a36b5d 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -231,7 +231,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
231 | public event ScriptReset OnScriptReset; | 231 | public event ScriptReset OnScriptReset; |
232 | public event GetScriptRunning OnGetScriptRunning; | 232 | public event GetScriptRunning OnGetScriptRunning; |
233 | public event SetScriptRunning OnSetScriptRunning; | 233 | public event SetScriptRunning OnSetScriptRunning; |
234 | public event UpdateVector OnAutoPilotGo; | 234 | public event Action<Vector3> OnAutoPilotGo; |
235 | public event TerrainUnacked OnUnackedTerrain; | 235 | public event TerrainUnacked OnUnackedTerrain; |
236 | public event ActivateGesture OnActivateGesture; | 236 | public event ActivateGesture OnActivateGesture; |
237 | public event DeactivateGesture OnDeactivateGesture; | 237 | public event DeactivateGesture OnDeactivateGesture; |
@@ -11617,36 +11617,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11617 | 11617 | ||
11618 | protected void HandleAutopilot(Object sender, string method, List<String> args) | 11618 | protected void HandleAutopilot(Object sender, string method, List<String> args) |
11619 | { | 11619 | { |
11620 | try | 11620 | float locx = 0; |
11621 | { | 11621 | float locy = 0; |
11622 | float locx = 0f; | 11622 | float locz = 0; |
11623 | float locy = 0f; | 11623 | uint regionX = 0; |
11624 | float locz = 0f; | 11624 | uint regionY = 0; |
11625 | uint regionX = 0; | ||
11626 | uint regionY = 0; | ||
11627 | try | ||
11628 | { | ||
11629 | Utils.LongToUInts(m_scene.RegionInfo.RegionHandle, out regionX, out regionY); | ||
11630 | locx = Convert.ToSingle(args[0]) - (float)regionX; | ||
11631 | locy = Convert.ToSingle(args[1]) - (float)regionY; | ||
11632 | locz = Convert.ToSingle(args[2]); | ||
11633 | } | ||
11634 | catch (InvalidCastException) | ||
11635 | { | ||
11636 | m_log.Error("[CLIENT]: Invalid autopilot request"); | ||
11637 | return; | ||
11638 | } | ||
11639 | 11625 | ||
11640 | UpdateVector handlerAutoPilotGo = OnAutoPilotGo; | 11626 | Utils.LongToUInts(m_scene.RegionInfo.RegionHandle, out regionX, out regionY); |
11641 | if (handlerAutoPilotGo != null) | 11627 | locx = Convert.ToSingle(args[0]) - (float)regionX; |
11642 | { | 11628 | locy = Convert.ToSingle(args[1]) - (float)regionY; |
11643 | handlerAutoPilotGo(0, new Vector3(locx, locy, locz), this); | 11629 | locz = Convert.ToSingle(args[2]); |
11644 | } | 11630 | |
11645 | } | 11631 | Action<Vector3> handlerAutoPilotGo = OnAutoPilotGo; |
11646 | catch (Exception e) | 11632 | if (handlerAutoPilotGo != null) |
11647 | { | 11633 | handlerAutoPilotGo(new Vector3(locx, locy, locz)); |
11648 | m_log.ErrorFormat("[LLCLIENTVIEW]: HandleAutopilot exception {0} {1}", e.Message, e.StackTrace); | ||
11649 | } | ||
11650 | } | 11634 | } |
11651 | 11635 | ||
11652 | /// <summary> | 11636 | /// <summary> |
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs index 17766ea..4f58ab0 100644 --- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs +++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs | |||
@@ -222,7 +222,7 @@ namespace OpenSim.Region.Examples.SimpleModule | |||
222 | public event ScriptReset OnScriptReset; | 222 | public event ScriptReset OnScriptReset; |
223 | public event GetScriptRunning OnGetScriptRunning; | 223 | public event GetScriptRunning OnGetScriptRunning; |
224 | public event SetScriptRunning OnSetScriptRunning; | 224 | public event SetScriptRunning OnSetScriptRunning; |
225 | public event UpdateVector OnAutoPilotGo; | 225 | public event Action<Vector3> OnAutoPilotGo; |
226 | 226 | ||
227 | public event TerrainUnacked OnUnackedTerrain; | 227 | public event TerrainUnacked OnUnackedTerrain; |
228 | 228 | ||
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}", |
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 3335f2e..a0c1ab1 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -806,7 +806,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
806 | public event ScriptReset OnScriptReset; | 806 | public event ScriptReset OnScriptReset; |
807 | public event GetScriptRunning OnGetScriptRunning; | 807 | public event GetScriptRunning OnGetScriptRunning; |
808 | public event SetScriptRunning OnSetScriptRunning; | 808 | public event SetScriptRunning OnSetScriptRunning; |
809 | public event UpdateVector OnAutoPilotGo; | 809 | public event Action<Vector3> OnAutoPilotGo; |
810 | public event TerrainUnacked OnUnackedTerrain; | 810 | public event TerrainUnacked OnUnackedTerrain; |
811 | public event ActivateGesture OnActivateGesture; | 811 | public event ActivateGesture OnActivateGesture; |
812 | public event DeactivateGesture OnDeactivateGesture; | 812 | public event DeactivateGesture OnDeactivateGesture; |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index e87993a..dfc624d 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -328,7 +328,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
328 | public event ScriptReset OnScriptReset; | 328 | public event ScriptReset OnScriptReset; |
329 | public event GetScriptRunning OnGetScriptRunning; | 329 | public event GetScriptRunning OnGetScriptRunning; |
330 | public event SetScriptRunning OnSetScriptRunning; | 330 | public event SetScriptRunning OnSetScriptRunning; |
331 | public event UpdateVector OnAutoPilotGo; | 331 | public event Action<Vector3> OnAutoPilotGo; |
332 | 332 | ||
333 | public event TerrainUnacked OnUnackedTerrain; | 333 | public event TerrainUnacked OnUnackedTerrain; |
334 | 334 | ||
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index d139b25..a78ad0c 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
@@ -189,7 +189,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
189 | m_log.DebugFormat( | 189 | m_log.DebugFormat( |
190 | "[NPC MODULE]: Moving {0} to {1} in {2}", sp.Name, pos, scene.RegionInfo.RegionName); | 190 | "[NPC MODULE]: Moving {0} to {1} in {2}", sp.Name, pos, scene.RegionInfo.RegionName); |
191 | 191 | ||
192 | sp.DoMoveToPosition(0, pos, m_avatars[agentID]); | 192 | sp.DoMoveToPosition(pos); |
193 | } | 193 | } |
194 | } | 194 | } |
195 | } | 195 | } |