diff options
| author | Diva Canto | 2009-10-04 10:30:21 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-10-04 10:30:21 -0700 |
| commit | d93e0a05037495dcdabdffcc9b9f78747271da39 (patch) | |
| tree | c1c29485267b936a756ceb4b6ca9053f42dceec6 /OpenSim/Region | |
| parent | Closing more streams even if things fail. (diff) | |
| download | opensim-SC-d93e0a05037495dcdabdffcc9b9f78747271da39.zip opensim-SC-d93e0a05037495dcdabdffcc9b9f78747271da39.tar.gz opensim-SC-d93e0a05037495dcdabdffcc9b9f78747271da39.tar.bz2 opensim-SC-d93e0a05037495dcdabdffcc9b9f78747271da39.tar.xz | |
Guarding a line that is sometimes throwing a null pointer exception.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs index 713d43a..19ad0b4 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs | |||
| @@ -197,11 +197,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 197 | m_currentPacket = StartPacket; | 197 | m_currentPacket = StartPacket; |
| 198 | } | 198 | } |
| 199 | 199 | ||
| 200 | if (m_imageManager.Client.PacketHandler.GetQueueCount(ThrottleOutPacketType.Texture) == 0) | 200 | if ((m_imageManager != null) && (m_imageManager.Client != null) && (m_imageManager.Client.PacketHandler != null)) |
| 201 | { | 201 | if (m_imageManager.Client.PacketHandler.GetQueueCount(ThrottleOutPacketType.Texture) == 0) |
| 202 | //m_log.Debug("No textures queued, sending one packet to kickstart it"); | 202 | { |
| 203 | SendPacket(m_imageManager.Client); | 203 | //m_log.Debug("No textures queued, sending one packet to kickstart it"); |
| 204 | } | 204 | SendPacket(m_imageManager.Client); |
| 205 | } | ||
| 205 | } | 206 | } |
| 206 | } | 207 | } |
| 207 | } | 208 | } |