summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
diff options
context:
space:
mode:
authorEli Linden <eli@lindenlab.com>2010-05-25 14:33:30 -0700
committerEli Linden <eli@lindenlab.com>2010-05-25 14:33:30 -0700
commit208d935e8f22b03178648dec4bc579a3468232f9 (patch)
tree27f68d7fc161ae87287c3f113bbcd6f68cef6c14 /indra/newview/llviewertexture.cpp
parent16d337307ea618cc2a72b4611c3404b8c15f7f54 (diff)
parent1b56e796241f0efbcbe6a3f95d373220b6b54fad (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;