summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2010-05-27 14:31:39 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2010-05-27 14:31:39 -0400
commit4fdf70d2135c7ec0cb8d8067d4f916b1c9a1dda7 (patch)
tree466cf9f78f159065fff714f5a99247c1ba12ecd1 /indra/newview/llviewertexture.cpp
parent670e316dd78e386e5d52da3162d87e0333b29d8a (diff)
parente5273960de222ffae32405fde8e9fd566ff72d0a (diff)
merge
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
-rw-r--r--indra/newview/llviewertexture.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index d925ab0d90..d8a9ce9374 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1893,6 +1893,12 @@ bool LLViewerFetchedTexture::updateFetch()
h = mGLTexturep->getHeight(0);
c = mComponents;
}
+
+ const U32 override_tex_discard_level = gSavedSettings.getU32("TextureDiscardLevel");
+ if (override_tex_discard_level != 0)
+ {
+ desired_discard = override_tex_discard_level;
+ }
// bypass texturefetch directly by pulling from LLTextureCache
bool fetch_request_created = false;