OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix wrong lludp message usage

0.9.1.0-post-fixes
UbitUmarov 2019-09-18 18:43:45 +01:00
parent 24a977323b
commit 63239402ae
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -11297,10 +11297,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (lma == null) if (lma == null)
{ {
// Really doesn't exist // Really doesn't exist
TeleportCancelPacket tpCancel = (TeleportCancelPacket)PacketPool.Instance.GetPacket(PacketType.TeleportCancel); m_log.WarnFormat("[llClient]: landmark asset {0} not found",lmid.ToString());
tpCancel.Info.SessionID = tpReq.Info.SessionID; SendTeleportFailed("Could not find the landmark asset data");
tpCancel.Info.AgentID = tpReq.Info.AgentID;
OutPacket(tpCancel, ThrottleOutPacketType.Task);
} }
} }
@ -11311,10 +11309,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
catch (NullReferenceException) catch (NullReferenceException)
{ {
// asset not found generates null ref inside the assetlandmark constructor. // asset not found generates null ref inside the assetlandmark constructor.
TeleportCancelPacket tpCancel = (TeleportCancelPacket)PacketPool.Instance.GetPacket(PacketType.TeleportCancel); SendTeleportFailed("Could not find the landmark asset data");
tpCancel.Info.SessionID = tpReq.Info.SessionID;
tpCancel.Info.AgentID = tpReq.Info.AgentID;
OutPacket(tpCancel, ThrottleOutPacketType.Task);
return true; return true;
} }
} }
@ -11337,11 +11332,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
else else
{ {
//no event handler so cancel request //no event handler so cancel request
TeleportCancelPacket tpCancel = (TeleportCancelPacket)PacketPool.Instance.GetPacket(PacketType.TeleportCancel); SendTeleportFailed("Could not find the landmark asset data");
tpCancel.Info.AgentID = tpReq.Info.AgentID;
tpCancel.Info.SessionID = tpReq.Info.SessionID;
OutPacket(tpCancel, ThrottleOutPacketType.Task);
} }
return true; return true;
} }
@ -11402,10 +11393,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
else else
{ {
//no event handler so cancel request //no event handler so cancel request
TeleportCancelPacket tpCancel = (TeleportCancelPacket)PacketPool.Instance.GetPacket(PacketType.TeleportCancel); SendTeleportFailed("Could not process the teleport");
tpCancel.Info.SessionID = tpLocReq.AgentData.SessionID;
tpCancel.Info.AgentID = tpLocReq.AgentData.AgentID;
OutPacket(tpCancel, ThrottleOutPacketType.Task);
} }
return true; return true;
} }