Merge branch 'master' into careminster

1 files changed, 3 insertions, 0 deletions

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 6732d59..7a34f0b 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -84,6 +84,8 @@ namespace OpenSim.Framework
     public delegate void TeleportLandmarkRequest(
         IClientAPI remoteClient, AssetLandmark lm);
 
+    public delegate void TeleportCancel(IClientAPI remoteClient);
+
     public delegate void DisconnectUser();
 
     public delegate void RequestAvatarProperties(IClientAPI remoteClient, UUID avatarID);
@@ -793,6 +795,7 @@ namespace OpenSim.Framework
         event RequestAvatarProperties OnRequestAvatarProperties;
         event SetAlwaysRun OnSetAlwaysRun;
         event TeleportLandmarkRequest OnTeleportLandmarkRequest;
+        event TeleportCancel OnTeleportCancel;
         event DeRezObject OnDeRezObject;
         event Action<IClientAPI> OnRegionHandShakeReply;
         event GenericCall1 OnRequestWearables;