aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-02-25 19:10:02 +0000
committerJustin Clarke Casey2008-02-25 19:10:02 +0000
commit84c86c7bdd08f2cf4a05ce936047a3612425c25c (patch)
treead50192682ca629e5515e2611181aeb87e8a66de /OpenSim/Region
parent* Caught HttpListenerException and swallowed if with output (diff)
downloadopensim-SC_OLD-84c86c7bdd08f2cf4a05ce936047a3612425c25c.zip
opensim-SC_OLD-84c86c7bdd08f2cf4a05ce936047a3612425c25c.tar.gz
opensim-SC_OLD-84c86c7bdd08f2cf4a05ce936047a3612425c25c.tar.bz2
opensim-SC_OLD-84c86c7bdd08f2cf4a05ce936047a3612425c25c.tar.xz
* Resolve Mantis 667 by not passing on textures with no actual data onto TextureSender
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
index c325746..8987a19 100644
--- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
+++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
@@ -124,7 +124,10 @@ namespace OpenSim.Region.Environment.Modules
124 124
125 if (m_textureSenders.TryGetValue(textureID, out textureSender)) 125 if (m_textureSenders.TryGetValue(textureID, out textureSender))
126 { 126 {
127 if (texture == null) 127 // XXX It may be perfectly valid for a texture to have no data... but if we pass
128 // this on to the TextureSender it will blow up, so just discard for now.
129 // Needs investigation.
130 if (texture == null || texture.Data == null)
128 { 131 {
129 // Right now, leaving it up to lower level asset server code to post the fact that 132 // Right now, leaving it up to lower level asset server code to post the fact that
130 // this texture could not be found 133 // this texture could not be found