aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorMelanie2011-08-09 20:55:06 +0200
committerMelanie2011-08-09 20:55:06 +0200
commit0e9dda91cbaa0a4431772daeb338ecebf0d2268d (patch)
tree47efbae3f05b5f0b0c5d97c6c89603d61e4e1044 /OpenSim/Region/ClientStack/Linden
parentAllow removing users from search and avatar picker (diff)
downloadopensim-SC_OLD-0e9dda91cbaa0a4431772daeb338ecebf0d2268d.zip
opensim-SC_OLD-0e9dda91cbaa0a4431772daeb338ecebf0d2268d.tar.gz
opensim-SC_OLD-0e9dda91cbaa0a4431772daeb338ecebf0d2268d.tar.bz2
opensim-SC_OLD-0e9dda91cbaa0a4431772daeb338ecebf0d2268d.tar.xz
Guard against a bad login leaving us with a null queue
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index 95a8e23..758fd93 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -521,7 +521,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
521 // No dequeued packet waiting to be sent, try to pull one off 521 // No dequeued packet waiting to be sent, try to pull one off
522 // this queue 522 // this queue
523 queue = m_packetOutboxes[i]; 523 queue = m_packetOutboxes[i];
524 if (queue.Dequeue(out packet)) 524 if (queue != null && queue.Dequeue(out packet))
525 { 525 {
526 // A packet was pulled off the queue. See if we have 526 // A packet was pulled off the queue. See if we have
527 // enough tokens in the bucket to send it out 527 // enough tokens in the bucket to send it out