diff options
author | Mike Antipov <mantipov@productengine.com> | 2010-05-26 10:24:05 +0300 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2010-05-26 10:24:05 +0300 |
commit | 14418c197076d0eb01bb0852b8716fa966bc9d53 (patch) | |
tree | 3466623f7db960a929a236c7a92fb109c581abdb /indra/newview/llviewertexture.cpp | |
parent | 85b62440ef1127e6f3f5b853374cea51f12c37e0 (diff) | |
parent | 6885a1a6ad62f0e0e08a272911c8ac057a5cd94d (diff) |
Merge from default branch, resolving conflict in indra/newview/llinventorybridge.cpp
LLObjectBridge::openItem() was concurrency modified.
Applied behavior that was changed in c3220f7f7699 according to
VWR-13743 FIXED Change Request: Change double click action for inventory wearables
DEV-33391 FIXED Change Request: Change double click action for inventory wearables
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
-rw-r--r-- | indra/newview/llviewertexture.cpp | 6 |
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; |