summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-05-26 11:41:33 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-05-26 11:41:33 +0300
commita8978c1b52ad03bcfdfde99cde988ef663e5b9cd (patch)
tree2d5f73a7c1bb2ac5a8cb5761d7c6f979e267f9b7 /indra/newview/llviewertexture.cpp
parentdaa8d2b823fa0ca2a084bfbb38a7ee04720e6829 (diff)
parent14418c197076d0eb01bb0852b8716fa966bc9d53 (diff)
merge
--HG-- branch : product-engine
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;