aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Agent/TextureSender
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-18 20:02:25 +0000
committerMelanie Thielker2008-11-18 20:02:25 +0000
commit0abb762ecc3b87e210ffb7009bdddf8a1a159419 (patch)
tree63146b32190da78537f658dcd73b28701bbf2bae /OpenSim/Region/Environment/Modules/Agent/TextureSender
parentRemove perts of jhurliman's AD security patch that had slipped in (diff)
downloadopensim-SC_OLD-0abb762ecc3b87e210ffb7009bdddf8a1a159419.zip
opensim-SC_OLD-0abb762ecc3b87e210ffb7009bdddf8a1a159419.tar.gz
opensim-SC_OLD-0abb762ecc3b87e210ffb7009bdddf8a1a159419.tar.bz2
opensim-SC_OLD-0abb762ecc3b87e210ffb7009bdddf8a1a159419.tar.xz
Patch from jhurliman. Fixing the texture decoding issues in progressive
texture sending. Grain of salt not included.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Agent/TextureSender')
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
index b177103..65ca854 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
@@ -27,7 +27,6 @@
27 27
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using OpenMetaverse.Packets;
31using log4net; 30using log4net;
32using OpenSim.Framework; 31using OpenSim.Framework;
33using OpenSim.Region.Environment.Interfaces; 32using OpenSim.Region.Environment.Interfaces;
@@ -198,7 +197,7 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
198 // See ITextureSender 197 // See ITextureSender
199 public bool SendTexturePacket() 198 public bool SendTexturePacket()
200 { 199 {
201 if (!m_cancel && (sendFirstPacket || download.CurrentPacket <= download.StopPacket)) 200 if (download != null && !m_cancel && (sendFirstPacket || download.CurrentPacket <= download.StopPacket))
202 { 201 {
203 SendPacket(); 202 SendPacket();
204 return false; 203 return false;