diff options
author | Justin Clarke Casey | 2008-09-20 19:05:00 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-09-20 19:05:00 +0000 |
commit | 23ea8f5221d35aad9b80edf72343b0adb2a15ddc (patch) | |
tree | 37ef7a39de9786bf970c042b1e9b31832e38b410 /OpenSim/Region | |
parent | Fix up some ScriptBase details (diff) | |
download | opensim-SC_OLD-23ea8f5221d35aad9b80edf72343b0adb2a15ddc.zip opensim-SC_OLD-23ea8f5221d35aad9b80edf72343b0adb2a15ddc.tar.gz opensim-SC_OLD-23ea8f5221d35aad9b80edf72343b0adb2a15ddc.tar.bz2 opensim-SC_OLD-23ea8f5221d35aad9b80edf72343b0adb2a15ddc.tar.xz |
* 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
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 15 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs | 1 |
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index a55ce1c..bd67f1e 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -645,23 +645,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
645 | } | 645 | } |
646 | } | 646 | } |
647 | 647 | ||
648 | /// <summary> | ||
649 | /// Main packet processing loop for the UDP component of the client session. Both incoming and outgoing | ||
650 | /// packets are processed here. | ||
651 | /// </summary> | ||
648 | protected virtual void ClientLoop() | 652 | protected virtual void ClientLoop() |
649 | { | 653 | { |
650 | m_log.Info("[CLIENT]: Entered main packet processing loop"); | 654 | m_log.DebugFormat( |
655 | "[CLIENT]: Entered main packet processing loop for {0} {1}", FirstName, LastName); | ||
651 | 656 | ||
652 | while (true) | 657 | while (true) |
653 | { | 658 | { |
654 | LLQueItem nextPacket = m_PacketHandler.PacketQueue.Dequeue(); | 659 | LLQueItem nextPacket = m_PacketHandler.PacketQueue.Dequeue(); |
655 | if (nextPacket == null) | 660 | |
656 | { | ||
657 | m_log.Error("Got a NULL packet in Client Loop, bailing out of our client loop"); | ||
658 | break; | ||
659 | } | ||
660 | if (nextPacket.Incoming) | 661 | if (nextPacket.Incoming) |
661 | { | 662 | { |
662 | DebugPacket("IN", nextPacket.Packet); | 663 | DebugPacket("IN", nextPacket.Packet); |
663 | m_PacketHandler.ProcessInPacket(nextPacket); | 664 | m_PacketHandler.ProcessInPacket(nextPacket); |
664 | } | 665 | } |
665 | else | 666 | else |
666 | { | 667 | { |
667 | DebugPacket("OUT", nextPacket.Packet); | 668 | DebugPacket("OUT", nextPacket.Packet); |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs index 1e369ec..32b4bc1 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs | |||
@@ -135,7 +135,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
135 | 135 | ||
136 | /* STANDARD QUEUE MANIPULATION INTERFACES */ | 136 | /* STANDARD QUEUE MANIPULATION INTERFACES */ |
137 | 137 | ||
138 | |||
139 | public void Enqueue(LLQueItem item) | 138 | public void Enqueue(LLQueItem item) |
140 | { | 139 | { |
141 | if (!m_enabled) | 140 | if (!m_enabled) |