summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-26 08:43:57 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-26 08:43:57 +0100
commit12cf2112413a62b44638cf080c2fdf4608db8a65 (patch)
tree0a41eaa71baf9f7431b442b4b61b5eadb57e61cd /indra/newview/llviewertexture.cpp
parentb59a80f20bd6b778ea9edfe8f5b78b2e5a25864e (diff)
parent14418c197076d0eb01bb0852b8716fa966bc9d53 (diff)
merge from viewer-public
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;