diff options
author | Melanie | 2011-12-10 15:17:34 +0000 |
---|---|---|
committer | Melanie | 2011-12-10 15:17:34 +0000 |
commit | 3a91085ac2364c80b53275886c8130a4b1f0e62f (patch) | |
tree | a8474ab6c3ca3e46905594e880308b00006e263a /OpenSim/Region/ClientStack/Linden | |
parent | minor: remove a mono compiler warning (diff) | |
download | opensim-SC-3a91085ac2364c80b53275886c8130a4b1f0e62f.zip opensim-SC-3a91085ac2364c80b53275886c8130a4b1f0e62f.tar.gz opensim-SC-3a91085ac2364c80b53275886c8130a4b1f0e62f.tar.bz2 opensim-SC-3a91085ac2364c80b53275886c8130a4b1f0e62f.tar.xz |
Implement handler for TeleportCancel inbound packet
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 1d4be8a..7223438 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; |
@@ -5173,6 +5174,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5173 | AddLocalPacketHandler(PacketType.MapBlockRequest, HandleMapBlockRequest, false); | 5174 | AddLocalPacketHandler(PacketType.MapBlockRequest, HandleMapBlockRequest, false); |
5174 | AddLocalPacketHandler(PacketType.MapNameRequest, HandleMapNameRequest, false); | 5175 | AddLocalPacketHandler(PacketType.MapNameRequest, HandleMapNameRequest, false); |
5175 | AddLocalPacketHandler(PacketType.TeleportLandmarkRequest, HandleTeleportLandmarkRequest); | 5176 | AddLocalPacketHandler(PacketType.TeleportLandmarkRequest, HandleTeleportLandmarkRequest); |
5177 | AddLocalPacketHandler(PacketType.TeleportCancel, HandleTeleportCancel); | ||
5176 | AddLocalPacketHandler(PacketType.TeleportLocationRequest, HandleTeleportLocationRequest); | 5178 | AddLocalPacketHandler(PacketType.TeleportLocationRequest, HandleTeleportLocationRequest); |
5177 | AddLocalPacketHandler(PacketType.UUIDNameRequest, HandleUUIDNameRequest, false); | 5179 | AddLocalPacketHandler(PacketType.UUIDNameRequest, HandleUUIDNameRequest, false); |
5178 | AddLocalPacketHandler(PacketType.RegionHandleRequest, HandleRegionHandleRequest); | 5180 | AddLocalPacketHandler(PacketType.RegionHandleRequest, HandleRegionHandleRequest); |
@@ -8409,6 +8411,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8409 | return true; | 8411 | return true; |
8410 | } | 8412 | } |
8411 | 8413 | ||
8414 | private bool HandleTeleportCancel(IClientAPI sender, Packet Pack) | ||
8415 | { | ||
8416 | TeleportCancel handlerTeleportCancel = OnTeleportCancel; | ||
8417 | if (handlerTeleportCancel != null) | ||
8418 | { | ||
8419 | handlerTeleportCancel(this); | ||
8420 | } | ||
8421 | return true; | ||
8422 | } | ||
8423 | |||
8412 | private AssetBase FindAssetInUserAssetServer(string id) | 8424 | private AssetBase FindAssetInUserAssetServer(string id) |
8413 | { | 8425 | { |
8414 | AgentCircuitData aCircuit = ((Scene)Scene).AuthenticateHandler.GetAgentCircuitData(CircuitCode); | 8426 | AgentCircuitData aCircuit = ((Scene)Scene).AuthenticateHandler.GetAgentCircuitData(CircuitCode); |