diff options
| author | Melanie | 2011-10-11 22:42:18 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-11 22:42:18 +0100 |
| commit | 652c59c0a9e7ac16127f0358e91fd216576c0ad0 (patch) | |
| tree | e967460e6e83aa88bd49865af312b1b5738507fd /OpenSim/Region/ClientStack | |
| parent | Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmerge (diff) | |
| parent | Reinstate option to land an npc when it reaches a target. (diff) | |
| download | opensim-SC-652c59c0a9e7ac16127f0358e91fd216576c0ad0.zip opensim-SC-652c59c0a9e7ac16127f0358e91fd216576c0ad0.tar.gz opensim-SC-652c59c0a9e7ac16127f0358e91fd216576c0ad0.tar.bz2 opensim-SC-652c59c0a9e7ac16127f0358e91fd216576c0ad0.tar.xz | |
Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 37024fd..243dad5 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -232,7 +232,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 232 | public event ScriptReset OnScriptReset; | 232 | public event ScriptReset OnScriptReset; |
| 233 | public event GetScriptRunning OnGetScriptRunning; | 233 | public event GetScriptRunning OnGetScriptRunning; |
| 234 | public event SetScriptRunning OnSetScriptRunning; | 234 | public event SetScriptRunning OnSetScriptRunning; |
| 235 | public event Action<Vector3, bool> OnAutoPilotGo; | 235 | public event Action<Vector3, bool, bool> OnAutoPilotGo; |
| 236 | public event TerrainUnacked OnUnackedTerrain; | 236 | public event TerrainUnacked OnUnackedTerrain; |
| 237 | public event ActivateGesture OnActivateGesture; | 237 | public event ActivateGesture OnActivateGesture; |
| 238 | public event DeactivateGesture OnDeactivateGesture; | 238 | public event DeactivateGesture OnDeactivateGesture; |
| @@ -11756,9 +11756,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 11756 | locy = Convert.ToSingle(args[1]) - (float)regionY; | 11756 | locy = Convert.ToSingle(args[1]) - (float)regionY; |
| 11757 | locz = Convert.ToSingle(args[2]); | 11757 | locz = Convert.ToSingle(args[2]); |
| 11758 | 11758 | ||
| 11759 | Action<Vector3, bool> handlerAutoPilotGo = OnAutoPilotGo; | 11759 | Action<Vector3, bool, bool> handlerAutoPilotGo = OnAutoPilotGo; |
| 11760 | if (handlerAutoPilotGo != null) | 11760 | if (handlerAutoPilotGo != null) |
| 11761 | handlerAutoPilotGo(new Vector3(locx, locy, locz), false); | 11761 | handlerAutoPilotGo(new Vector3(locx, locy, locz), false, false); |
| 11762 | } | 11762 | } |
| 11763 | 11763 | ||
| 11764 | /// <summary> | 11764 | /// <summary> |