aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-08-03 23:06:00 -0700
committerMcCabe Maxsted2010-08-26 11:16:00 -0700
commit37028b596b3cb845ca4cd4d67d6aab033478b015 (patch)
treecef3ed3895af3c4b93f8ffbce638e7c016bf75c5 /linden
parentAvatar sounds now don't disable when from a region above current maturity (diff)
downloadmeta-impy-37028b596b3cb845ca4cd4d67d6aab033478b015.zip
meta-impy-37028b596b3cb845ca4cd4d67d6aab033478b015.tar.gz
meta-impy-37028b596b3cb845ca4cd4d67d6aab033478b015.tar.bz2
meta-impy-37028b596b3cb845ca4cd4d67d6aab033478b015.tar.xz
Don't llerrs if textures have bogus params
Diffstat (limited to 'linden')
-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 d6474f7..7cd4dd7 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -1231,7 +1231,9 @@ BOOL LLImageGL::readBackRaw(S32 discard_level, LLImageRaw* imageraw, bool compre
1231 1231
1232 if (width <= 0 || width > 2048 || height <= 0 || height > 2048 || ncomponents < 1 || ncomponents > 4) 1232 if (width <= 0 || width > 2048 || height <= 0 || height > 2048 || ncomponents < 1 || ncomponents > 4)
1233 { 1233 {
1234 llerrs << llformat("LLImageGL::readBackRaw: bogus params: %d x %d x %d",width,height,ncomponents) << llendl; 1234 //llerrs << llformat("LLImageGL::readBackRaw: bogus params: %d x %d x %d",width,height,ncomponents) << llendl;
1235 llwarns << llformat("LLImageGL::readBackRaw: bogus params: %d x %d x %d",width,height,ncomponents) << llendl;
1236 return FALSE;
1235 } 1237 }
1236 1238
1237 LLGLint is_compressed = 0; 1239 LLGLint is_compressed = 0;