From c2e75aecd1eba90d3a376896f1a798a4c9c58e6d Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Tue, 14 Apr 2009 01:57:35 +0000
Subject: * Commit a variety of fixes to bugs discovered while trying to fix
 the NaN singularity. * WebStatsModule doesn't crash on restart.   GodsModule
 doesn't crash when there is no Dialog Module.  LLUDPServer doesn't crash when
 the Operation was Aborted. * ODEPlugin does 'Almost NaN' sanity checks. *
 ODEPlugin sacrifices NaN avatars to the NaN black hole to appease it and keep
 it from sucking the rest of the world in.

---
 OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs | 10 ++++++++++
 OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs    |  1 +
 2 files changed, 11 insertions(+)

(limited to 'OpenSim/Region/ClientStack/LindenUDP')

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
index aa2423f..f0fd74b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs
@@ -199,6 +199,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             
             int numCollected = 0;
             //First of all make sure our packet queue isn't above our threshold 
+            if (m_client == null)
+                return;
+
+            if (m_client.PacketHandler == null)
+                return;
+
+            if (m_client.PacketHandler.PacketQueue == null)
+                return;
+
+
             if (m_client.PacketHandler.PacketQueue.TextureOutgoingPacketQueueCount < 200)
             {
                 
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 3b9d293..26a8959 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -378,6 +378,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                     case SocketError.NetworkReset:
                     case SocketError.ConnectionReset:
+                    case SocketError.OperationAborted:
                         break;
 
                     default:
-- 
cgit v1.1