diff options
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 481e1bb..a0d10ed 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -786,7 +786,7 @@ namespace OpenSim.Framework | |||
786 | event DeRezObject OnDeRezObject; | 786 | event DeRezObject OnDeRezObject; |
787 | event Action<IClientAPI> OnRegionHandShakeReply; | 787 | event Action<IClientAPI> OnRegionHandShakeReply; |
788 | event GenericCall1 OnRequestWearables; | 788 | event GenericCall1 OnRequestWearables; |
789 | event GenericCall1 OnCompleteMovementToRegion; | 789 | event Action<IClientAPI, bool> OnCompleteMovementToRegion; |
790 | event UpdateAgent OnPreAgentUpdate; | 790 | event UpdateAgent OnPreAgentUpdate; |
791 | event UpdateAgent OnAgentUpdate; | 791 | event UpdateAgent OnAgentUpdate; |
792 | event AgentRequestSit OnAgentRequestSit; | 792 | event AgentRequestSit OnAgentRequestSit; |
@@ -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> OnAutoPilotGo; | 938 | event Action<Vector3, bool> OnAutoPilotGo; |
939 | 939 | ||
940 | event TerrainUnacked OnUnackedTerrain; | 940 | event TerrainUnacked OnUnackedTerrain; |
941 | event ActivateGesture OnActivateGesture; | 941 | event ActivateGesture OnActivateGesture; |