aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorTeravus Ovares2009-04-14 01:57:35 +0000
committerTeravus Ovares2009-04-14 01:57:35 +0000
commitc2e75aecd1eba90d3a376896f1a798a4c9c58e6d (patch)
tree277760c63ec2af87374d62e2c3fd78a081e4be7a /OpenSim/Region/ClientStack
parent* Set eol-style: native on J2KImage.cs (diff)
downloadopensim-SC-c2e75aecd1eba90d3a376896f1a798a4c9c58e6d.zip
opensim-SC-c2e75aecd1eba90d3a376896f1a798a4c9c58e6d.tar.gz
opensim-SC-c2e75aecd1eba90d3a376896f1a798a4c9c58e6d.tar.bz2
opensim-SC-c2e75aecd1eba90d3a376896f1a798a4c9c58e6d.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs10
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs1
2 files changed, 11 insertions, 0 deletions
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
199 199
200 int numCollected = 0; 200 int numCollected = 0;
201 //First of all make sure our packet queue isn't above our threshold 201 //First of all make sure our packet queue isn't above our threshold
202 if (m_client == null)
203 return;
204
205 if (m_client.PacketHandler == null)
206 return;
207
208 if (m_client.PacketHandler.PacketQueue == null)
209 return;
210
211
202 if (m_client.PacketHandler.PacketQueue.TextureOutgoingPacketQueueCount < 200) 212 if (m_client.PacketHandler.PacketQueue.TextureOutgoingPacketQueueCount < 200)
203 { 213 {
204 214
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
378 378
379 case SocketError.NetworkReset: 379 case SocketError.NetworkReset:
380 case SocketError.ConnectionReset: 380 case SocketError.ConnectionReset:
381 case SocketError.OperationAborted:
381 break; 382 break;
382 383
383 default: 384 default: