diff options
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index d8fcb62..3a9e4b7 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -8301,6 +8301,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8301 | AssetLandmark lm; | 8301 | AssetLandmark lm; |
8302 | if (lmid != UUID.Zero) | 8302 | if (lmid != UUID.Zero) |
8303 | { | 8303 | { |
8304 | |||
8304 | //AssetBase lma = m_assetCache.GetAsset(lmid, false); | 8305 | //AssetBase lma = m_assetCache.GetAsset(lmid, false); |
8305 | AssetBase lma = m_assetService.Get(lmid.ToString()); | 8306 | AssetBase lma = m_assetService.Get(lmid.ToString()); |
8306 | 8307 | ||
@@ -8341,13 +8342,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
8341 | TeleportLandmarkRequest handlerTeleportLandmarkRequest = OnTeleportLandmarkRequest; | 8342 | TeleportLandmarkRequest handlerTeleportLandmarkRequest = OnTeleportLandmarkRequest; |
8342 | if (handlerTeleportLandmarkRequest != null) | 8343 | if (handlerTeleportLandmarkRequest != null) |
8343 | { | 8344 | { |
8344 | handlerTeleportLandmarkRequest(this, lm.RegionID, lm.Position); | 8345 | handlerTeleportLandmarkRequest(this, lm); |
8345 | } | 8346 | } |
8346 | else | 8347 | else |
8347 | { | 8348 | { |
8348 | //no event handler so cancel request | 8349 | //no event handler so cancel request |
8349 | |||
8350 | |||
8351 | TeleportCancelPacket tpCancel = (TeleportCancelPacket)PacketPool.Instance.GetPacket(PacketType.TeleportCancel); | 8350 | TeleportCancelPacket tpCancel = (TeleportCancelPacket)PacketPool.Instance.GetPacket(PacketType.TeleportCancel); |
8352 | tpCancel.Info.AgentID = tpReq.Info.AgentID; | 8351 | tpCancel.Info.AgentID = tpReq.Info.AgentID; |
8353 | tpCancel.Info.SessionID = tpReq.Info.SessionID; | 8352 | tpCancel.Info.SessionID = tpReq.Info.SessionID; |