diff options
| author | Dan Lake | 2011-09-21 16:24:48 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-09-21 16:24:48 -0700 |
| commit | 28a482a7ee2cebab1aa720477af175d7e26d702e (patch) | |
| tree | 863fb4b43a571da4d1d963b5a1383538e6391ec8 /OpenSim/Region/ClientStack/Linden | |
| parent | Commented out new debug statements in ScenePresence (diff) | |
| parent | Reinstate option to land an npc when it reaches a target. (diff) | |
| download | opensim-SC-28a482a7ee2cebab1aa720477af175d7e26d702e.zip opensim-SC-28a482a7ee2cebab1aa720477af175d7e26d702e.tar.gz opensim-SC-28a482a7ee2cebab1aa720477af175d7e26d702e.tar.bz2 opensim-SC-28a482a7ee2cebab1aa720477af175d7e26d702e.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
| -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 b5c6742..ce2ff86 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 Action<Vector3, bool> OnAutoPilotGo; | 234 | public event Action<Vector3, bool, bool> 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; |
| @@ -11640,9 +11640,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 11640 | locy = Convert.ToSingle(args[1]) - (float)regionY; | 11640 | locy = Convert.ToSingle(args[1]) - (float)regionY; |
| 11641 | locz = Convert.ToSingle(args[2]); | 11641 | locz = Convert.ToSingle(args[2]); |
| 11642 | 11642 | ||
| 11643 | Action<Vector3, bool> handlerAutoPilotGo = OnAutoPilotGo; | 11643 | Action<Vector3, bool, bool> handlerAutoPilotGo = OnAutoPilotGo; |
| 11644 | if (handlerAutoPilotGo != null) | 11644 | if (handlerAutoPilotGo != null) |
| 11645 | handlerAutoPilotGo(new Vector3(locx, locy, locz), false); | 11645 | handlerAutoPilotGo(new Vector3(locx, locy, locz), false, false); |
| 11646 | } | 11646 | } |
| 11647 | 11647 | ||
| 11648 | /// <summary> | 11648 | /// <summary> |