aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender/llimagegl.cpp
diff options
context:
space:
mode:
authorArmin Weatherwax2010-02-03 17:10:57 +0100
committerJacek Antonelli2010-02-22 01:39:11 -0600
commit973f07db7982e78c634c29f6139dea547a111141 (patch)
treed98b613386f9de0151a7b8528ac366d700b5e91c /linden/indra/llrender/llimagegl.cpp
parentFixed an error at shutdown (gSavedSettings.cleanup). (diff)
downloadmeta-impy-973f07db7982e78c634c29f6139dea547a111141.zip
meta-impy-973f07db7982e78c634c29f6139dea547a111141.tar.gz
meta-impy-973f07db7982e78c634c29f6139dea547a111141.tar.bz2
meta-impy-973f07db7982e78c634c29f6139dea547a111141.tar.xz
Fixed a rare crash from textures with too many components.
Only seen in lbsa plaza on OSGrid, so far.
Diffstat (limited to '')
-rw-r--r--linden/indra/llrender/llimagegl.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index 27b1d55..544eb80 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -1014,7 +1014,9 @@ BOOL LLImageGL::createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S
1014 mFormatType = GL_UNSIGNED_BYTE; 1014 mFormatType = GL_UNSIGNED_BYTE;
1015 break; 1015 break;
1016 default: 1016 default:
1017 llerrs << "Bad number of components for texture: " << (U32)getComponents() << llendl; 1017 LL_DEBUGS("Openjpeg") << "Bad number of components for texture: " << (U32)getComponents() << LL_ENDL;
1018 to_create = false;
1019 break;
1018 } 1020 }
1019 } 1021 }
1020 1022