aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-17 23:48:29 +0000
committerMelanie Thielker2008-11-17 23:48:29 +0000
commit6fd8960064dccc7a110163598ee9186e74972c7b (patch)
tree4714c2010ae6a69a74ad3670fdf833186e50dc6d /OpenSim/Region
parentMake newly created prims be the correct group (diff)
downloadopensim-SC_OLD-6fd8960064dccc7a110163598ee9186e74972c7b.zip
opensim-SC_OLD-6fd8960064dccc7a110163598ee9186e74972c7b.tar.gz
opensim-SC_OLD-6fd8960064dccc7a110163598ee9186e74972c7b.tar.bz2
opensim-SC_OLD-6fd8960064dccc7a110163598ee9186e74972c7b.tar.xz
Prevent the texture downloader from locking a null object when a download
hits bad data
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
index 53be7c5..583062d 100644
--- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
+++ b/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs
@@ -176,6 +176,9 @@ namespace OpenSim.Region.Environment.Modules.Agent.TextureSender
176 // See ITextureSender 176 // See ITextureSender
177 public void UpdateRequest(int discardLevel, uint packetNumber) 177 public void UpdateRequest(int discardLevel, uint packetNumber)
178 { 178 {
179 if (download == null)
180 return;
181
179 lock (download) 182 lock (download)
180 { 183 {
181 if (discardLevel < download.DiscardLevel) 184 if (discardLevel < download.DiscardLevel)