fix wrong lludp message usage
parent
24a977323b
commit
63239402ae
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue