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

* refactor: remove unnecessary packet null check in LLClientView 

* if a packet was really null it would be caught by the general exception handler at the top of the client thread, which would also provide more information and attempt a clean 
shutdown
0.6.0-stable
Justin Clarke Casey 2008-09-20 19:05:00 +00:00
parent e7064c0b19
commit 23ea8f5221
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -645,23 +645,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
} }
/// <summary>
/// Main packet processing loop for the UDP component of the client session. Both incoming and outgoing
/// packets are processed here.
/// </summary>
protected virtual void ClientLoop() protected virtual void ClientLoop()
{ {
m_log.Info("[CLIENT]: Entered main packet processing loop"); m_log.DebugFormat(
"[CLIENT]: Entered main packet processing loop for {0} {1}", FirstName, LastName);
while (true) while (true)
{ {
LLQueItem nextPacket = m_PacketHandler.PacketQueue.Dequeue(); LLQueItem nextPacket = m_PacketHandler.PacketQueue.Dequeue();
if (nextPacket == null)
{
m_log.Error("Got a NULL packet in Client Loop, bailing out of our client loop");
break;
}
if (nextPacket.Incoming) if (nextPacket.Incoming)
{ {
DebugPacket("IN", nextPacket.Packet); DebugPacket("IN", nextPacket.Packet);
m_PacketHandler.ProcessInPacket(nextPacket); m_PacketHandler.ProcessInPacket(nextPacket);
} }
else else
{ {
DebugPacket("OUT", nextPacket.Packet); DebugPacket("OUT", nextPacket.Packet);

1
OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
View File

@ -135,7 +135,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/* STANDARD QUEUE MANIPULATION INTERFACES */ /* STANDARD QUEUE MANIPULATION INTERFACES */
public void Enqueue(LLQueItem item) public void Enqueue(LLQueItem item)
{ {
if (!m_enabled) if (!m_enabled)