diff options
5 files changed, 18 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 | |||
84 | public delegate void TeleportLandmarkRequest( | 84 | public delegate void TeleportLandmarkRequest( |
85 | IClientAPI remoteClient, AssetLandmark lm); | 85 | IClientAPI remoteClient, AssetLandmark lm); |
86 | 86 | ||
87 | public delegate void TeleportCancel(IClientAPI remoteClient); | ||
88 | |||
87 | public delegate void DisconnectUser(); | 89 | public delegate void DisconnectUser(); |
88 | 90 | ||
89 | public delegate void RequestAvatarProperties(IClientAPI remoteClient, UUID avatarID); | 91 | public delegate void RequestAvatarProperties(IClientAPI remoteClient, UUID avatarID); |
@@ -793,6 +795,7 @@ namespace OpenSim.Framework | |||
793 | event RequestAvatarProperties OnRequestAvatarProperties; | 795 | event RequestAvatarProperties OnRequestAvatarProperties; |
794 | event SetAlwaysRun OnSetAlwaysRun; | 796 | event SetAlwaysRun OnSetAlwaysRun; |
795 | event TeleportLandmarkRequest OnTeleportLandmarkRequest; | 797 | event TeleportLandmarkRequest OnTeleportLandmarkRequest; |
798 | event TeleportCancel OnTeleportCancel; | ||
796 | event DeRezObject OnDeRezObject; | 799 | event DeRezObject OnDeRezObject; |
797 | event Action<IClientAPI> OnRegionHandShakeReply; | 800 | event Action<IClientAPI> OnRegionHandShakeReply; |
798 | event GenericCall1 OnRequestWearables; | 801 | event GenericCall1 OnRequestWearables; |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index ace4444..11d3e36 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -140,6 +140,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
140 | public event RequestMapName OnMapNameRequest; | 140 | public event RequestMapName OnMapNameRequest; |
141 | public event TeleportLocationRequest OnTeleportLocationRequest; | 141 | public event TeleportLocationRequest OnTeleportLocationRequest; |
142 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest; | 142 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest; |
143 | public event TeleportCancel OnTeleportCancel; | ||
143 | public event DisconnectUser OnDisconnectUser; | 144 | public event DisconnectUser OnDisconnectUser; |
144 | public event RequestAvatarProperties OnRequestAvatarProperties; | 145 | public event RequestAvatarProperties OnRequestAvatarProperties; |
145 | public event SetAlwaysRun OnSetAlwaysRun; | 146 | public event SetAlwaysRun OnSetAlwaysRun; |
@@ -5231,6 +5232,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5231 | AddLocalPacketHandler(PacketType.MapBlockRequest, HandleMapBlockRequest, false); | 5232 | AddLocalPacketHandler(PacketType.MapBlockRequest, HandleMapBlockRequest, false); |
5232 | AddLocalPacketHandler(PacketType.MapNameRequest, HandleMapNameRequest, false); | 5233 | AddLocalPacketHandler(PacketType.MapNameRequest, HandleMapNameRequest, false); |
5233 | AddLocalPacketHandler(PacketType.TeleportLandmarkRequest, HandleTeleportLandmarkRequest); | 5234 | AddLocalPacketHandler(PacketType.TeleportLandmarkRequest, HandleTeleportLandmarkRequest); |
5235 | AddLocalPacketHandler(PacketType.TeleportCancel, HandleTeleportCancel); | ||
5234 | AddLocalPacketHandler(PacketType.TeleportLocationRequest, HandleTeleportLocationRequest); | 5236 | AddLocalPacketHandler(PacketType.TeleportLocationRequest, HandleTeleportLocationRequest); |
5235 | AddLocalPacketHandler(PacketType.UUIDNameRequest, HandleUUIDNameRequest, false); | 5237 | AddLocalPacketHandler(PacketType.UUIDNameRequest, HandleUUIDNameRequest, false); |
5236 | AddLocalPacketHandler(PacketType.RegionHandleRequest, HandleRegionHandleRequest); | 5238 | AddLocalPacketHandler(PacketType.RegionHandleRequest, HandleRegionHandleRequest); |
@@ -8470,6 +8472,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8470 | return true; | 8472 | return true; |
8471 | } | 8473 | } |
8472 | 8474 | ||
8475 | private bool HandleTeleportCancel(IClientAPI sender, Packet Pack) | ||
8476 | { | ||
8477 | TeleportCancel handlerTeleportCancel = OnTeleportCancel; | ||
8478 | if (handlerTeleportCancel != null) | ||
8479 | { | ||
8480 | handlerTeleportCancel(this); | ||
8481 | } | ||
8482 | return true; | ||
8483 | } | ||
8484 | |||
8473 | private AssetBase FindAssetInUserAssetServer(string id) | 8485 | private AssetBase FindAssetInUserAssetServer(string id) |
8474 | { | 8486 | { |
8475 | AgentCircuitData aCircuit = ((Scene)Scene).AuthenticateHandler.GetAgentCircuitData(CircuitCode); | 8487 | AgentCircuitData aCircuit = ((Scene)Scene).AuthenticateHandler.GetAgentCircuitData(CircuitCode); |
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index e62e30f..3164969 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -677,6 +677,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
677 | public event RequestAvatarProperties OnRequestAvatarProperties; | 677 | public event RequestAvatarProperties OnRequestAvatarProperties; |
678 | public event SetAlwaysRun OnSetAlwaysRun; | 678 | public event SetAlwaysRun OnSetAlwaysRun; |
679 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest; | 679 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest; |
680 | public event TeleportCancel OnTeleportCancel; | ||
680 | public event DeRezObject OnDeRezObject; | 681 | public event DeRezObject OnDeRezObject; |
681 | public event Action<IClientAPI> OnRegionHandShakeReply; | 682 | public event Action<IClientAPI> OnRegionHandShakeReply; |
682 | public event GenericCall1 OnRequestWearables; | 683 | public event GenericCall1 OnRequestWearables; |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 1b31663..6c7a683 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -184,6 +184,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
184 | public event RequestMapName OnMapNameRequest; | 184 | public event RequestMapName OnMapNameRequest; |
185 | public event TeleportLocationRequest OnTeleportLocationRequest; | 185 | public event TeleportLocationRequest OnTeleportLocationRequest; |
186 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest; | 186 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest; |
187 | public event TeleportCancel OnTeleportCancel; | ||
187 | public event DisconnectUser OnDisconnectUser; | 188 | public event DisconnectUser OnDisconnectUser; |
188 | public event RequestAvatarProperties OnRequestAvatarProperties; | 189 | public event RequestAvatarProperties OnRequestAvatarProperties; |
189 | public event SetAlwaysRun OnSetAlwaysRun; | 190 | public event SetAlwaysRun OnSetAlwaysRun; |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index 2b7895b..c8b1936 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -93,6 +93,7 @@ namespace OpenSim.Tests.Common.Mock | |||
93 | public event RequestMapName OnMapNameRequest; | 93 | public event RequestMapName OnMapNameRequest; |
94 | public event TeleportLocationRequest OnTeleportLocationRequest; | 94 | public event TeleportLocationRequest OnTeleportLocationRequest; |
95 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest; | 95 | public event TeleportLandmarkRequest OnTeleportLandmarkRequest; |
96 | public event TeleportCancel OnTeleportCancel; | ||
96 | public event DisconnectUser OnDisconnectUser; | 97 | public event DisconnectUser OnDisconnectUser; |
97 | public event RequestAvatarProperties OnRequestAvatarProperties; | 98 | public event RequestAvatarProperties OnRequestAvatarProperties; |
98 | public event SetAlwaysRun OnSetAlwaysRun; | 99 | public event SetAlwaysRun OnSetAlwaysRun; |