ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 22:26:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix wrong lludp message usage

Browse Source
This commit is contained in:
UbitUmarov
2019-09-18 18:43:45 +01:00
parent 24a977323b
commit 63239402ae
1 changed files with 5 additions and 17 deletions
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)
{
// Really doesn't exist
TeleportCancelPacket tpCancel = (TeleportCancelPacket)PacketPool.Instance.GetPacket(PacketType.TeleportCancel);
tpCancel.Info.SessionID = tpReq.Info.SessionID;
tpCancel.Info.AgentID = tpReq.Info.AgentID;
OutPacket(tpCancel, ThrottleOutPacketType.Task);
m_log.WarnFormat("[llClient]: landmark asset {0} not found",lmid.ToString());
SendTeleportFailed("Could not find the landmark asset data");
}
}
@@ -11311,10 +11309,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
catch (NullReferenceException)
{
// asset not found generates null ref inside the assetlandmark constructor.
TeleportCancelPacket tpCancel = (TeleportCancelPacket)PacketPool.Instance.GetPacket(PacketType.TeleportCancel);
tpCancel.Info.SessionID = tpReq.Info.SessionID;
tpCancel.Info.AgentID = tpReq.Info.AgentID;
OutPacket(tpCancel, ThrottleOutPacketType.Task);
SendTeleportFailed("Could not find the landmark asset data");
return true;
}
}
@@ -11337,11 +11332,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
else
{
//no event handler so cancel request
TeleportCancelPacket tpCancel = (TeleportCancelPacket)PacketPool.Instance.GetPacket(PacketType.TeleportCancel);
tpCancel.Info.AgentID = tpReq.Info.AgentID;
tpCancel.Info.SessionID = tpReq.Info.SessionID;
OutPacket(tpCancel, ThrottleOutPacketType.Task);
SendTeleportFailed("Could not find the landmark asset data");
}
return true;
}
@@ -11402,10 +11393,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
else
{
//no event handler so cancel request
TeleportCancelPacket tpCancel = (TeleportCancelPacket)PacketPool.Instance.GetPacket(PacketType.TeleportCancel);
tpCancel.Info.SessionID = tpLocReq.AgentData.SessionID;
tpCancel.Info.AgentID = tpLocReq.AgentData.AgentID;
OutPacket(tpCancel, ThrottleOutPacketType.Task);
SendTeleportFailed("Could not process the teleport");
}
return true;
}