diff options
author | Melanie | 2011-12-10 15:19:31 +0000 |
---|---|---|
committer | Melanie | 2011-12-10 15:19:31 +0000 |
commit | 6b080d57cb77463586af5a08d8137a553852de8a (patch) | |
tree | d735c92552f510088abefc60208cd5db3d4bfea0 /OpenSim/Region/ClientStack | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Implement handler for TeleportCancel inbound packet (diff) | |
download | opensim-SC-6b080d57cb77463586af5a08d8137a553852de8a.zip opensim-SC-6b080d57cb77463586af5a08d8137a553852de8a.tar.gz opensim-SC-6b080d57cb77463586af5a08d8137a553852de8a.tar.bz2 opensim-SC-6b080d57cb77463586af5a08d8137a553852de8a.tar.xz |
Merge branch 'master' into careminster
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 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); |