aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender/llimagegl.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:04 -0500
committerJacek Antonelli2008-08-15 23:45:04 -0500
commit117e22047c5752352342d64e3fb7ce00a4eb8113 (patch)
treee32de2cfba0dda8705ae528fcd1fbe23ba075685 /linden/indra/llrender/llimagegl.cpp
parentSecond Life viewer sources 1.18.0.6 (diff)
downloadmeta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.zip
meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.gz
meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.bz2
meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.xz
Second Life viewer sources 1.18.1.2
Diffstat (limited to 'linden/indra/llrender/llimagegl.cpp')
-rw-r--r--linden/indra/llrender/llimagegl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index e2c4a59..a2e5abc 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -963,7 +963,8 @@ BOOL LLImageGL::setDiscardLevel(S32 discard_level)
963 } 963 }
964 else 964 else
965 { 965 {
966#ifndef LL_LINUX // *FIX: This should not be skipped for the linux client. 966#if !LL_LINUX && !LL_SOLARIS
967 // *FIX: This should not be skipped for the linux client.
967 llerrs << "LLImageGL::setDiscardLevel() called on image without mipmaps" << llendl; 968 llerrs << "LLImageGL::setDiscardLevel() called on image without mipmaps" << llendl;
968#endif 969#endif
969 return FALSE; 970 return FALSE;