diff options
author | Melanie Thielker | 2009-04-20 17:24:09 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-04-20 17:24:09 +0000 |
commit | dd0fa5745ea8abf80a6e4631d8f682034887e014 (patch) | |
tree | 2d2073e152f1b7bf8dedb4a75bcc336e37a6be2a /OpenSim/Region | |
parent | Also make GroupsMessaging quit trying to run and reduce it's debug (diff) | |
download | opensim-SC_OLD-dd0fa5745ea8abf80a6e4631d8f682034887e014.zip opensim-SC_OLD-dd0fa5745ea8abf80a6e4631d8f682034887e014.tar.gz opensim-SC_OLD-dd0fa5745ea8abf80a6e4631d8f682034887e014.tar.bz2 opensim-SC_OLD-dd0fa5745ea8abf80a6e4631d8f682034887e014.tar.xz |
It is possible that apacket is recieved before the clint stack is fully ready.
This causes a nullref we need to catch here.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs index 169bab2..75f4e1d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs | |||
@@ -210,6 +210,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
210 | int threshold; | 210 | int threshold; |
211 | if (m_lastloopprocessed == 0) | 211 | if (m_lastloopprocessed == 0) |
212 | { | 212 | { |
213 | if (m_client.PacketHandler == null || m_client.PacketHandler.PacketQueue == null || m_client.PacketHandler.PacketQueue.TextureThrottle == null) | ||
214 | return; | ||
213 | //This is decent for a semi fast machine, but we'll calculate it more accurately based on time below | 215 | //This is decent for a semi fast machine, but we'll calculate it more accurately based on time below |
214 | threshold = m_client.PacketHandler.PacketQueue.TextureThrottle.Current / 6300; | 216 | threshold = m_client.PacketHandler.PacketQueue.TextureThrottle.Current / 6300; |
215 | m_lastloopprocessed = DateTime.Now.Ticks; | 217 | m_lastloopprocessed = DateTime.Now.Ticks; |