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/Framework | |
| 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/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 150ff1b..47e79d1 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -935,7 +935,7 @@ namespace OpenSim.Framework | |||
| 935 | event ScriptReset OnScriptReset; | 935 | event ScriptReset OnScriptReset; |
| 936 | event GetScriptRunning OnGetScriptRunning; | 936 | event GetScriptRunning OnGetScriptRunning; |
| 937 | event SetScriptRunning OnSetScriptRunning; | 937 | event SetScriptRunning OnSetScriptRunning; |
| 938 | event Action<Vector3, bool> OnAutoPilotGo; | 938 | event Action<Vector3, bool, bool> OnAutoPilotGo; |
| 939 | 939 | ||
| 940 | event TerrainUnacked OnUnackedTerrain; | 940 | event TerrainUnacked OnUnackedTerrain; |
| 941 | event ActivateGesture OnActivateGesture; | 941 | event ActivateGesture OnActivateGesture; |