From 84c86c7bdd08f2cf4a05ce936047a3612425c25c Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Mon, 25 Feb 2008 19:10:02 +0000 Subject: [PATCH] * Resolve Mantis 667 by not passing on textures with no actual data onto TextureSender --- .../Region/Environment/Modules/UserTextureDownloadService.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs index c325746644..8987a19643 100644 --- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs +++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs @@ -124,7 +124,10 @@ namespace OpenSim.Region.Environment.Modules if (m_textureSenders.TryGetValue(textureID, out textureSender)) { - if (texture == null) + // XXX It may be perfectly valid for a texture to have no data... but if we pass + // this on to the TextureSender it will blow up, so just discard for now. + // Needs investigation. + if (texture == null || texture.Data == null) { // Right now, leaving it up to lower level asset server code to post the fact that // this texture could not be found