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/Framework | |
| 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/Framework')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index ee3d6b6..cdd50d0 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -940,7 +940,7 @@ namespace OpenSim.Framework | |||
| 940 | event ScriptReset OnScriptReset; | 940 | event ScriptReset OnScriptReset; |
| 941 | event GetScriptRunning OnGetScriptRunning; | 941 | event GetScriptRunning OnGetScriptRunning; |
| 942 | event SetScriptRunning OnSetScriptRunning; | 942 | event SetScriptRunning OnSetScriptRunning; |
| 943 | event Action<Vector3, bool> OnAutoPilotGo; | 943 | event Action<Vector3, bool, bool> OnAutoPilotGo; |
| 944 | 944 | ||
| 945 | event TerrainUnacked OnUnackedTerrain; | 945 | event TerrainUnacked OnUnackedTerrain; |
| 946 | event ActivateGesture OnActivateGesture; | 946 | event ActivateGesture OnActivateGesture; |