diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-09-09 21:53:14 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-09-09 21:53:14 +0300 |
| commit | b4704f5f8bf4b72edcf00aa74759ae73c89c5422 (patch) | |
| tree | 691596f632ef36d7ec1c0705ada0a9f4070f8139 /indra/newview/llviewertexture.cpp | |
| parent | 1285807ec2f58c7dcab2f747461195e126ef26e3 (diff) | |
| parent | b1c5edc5135b4ade68b0aa839506ea013dc2f40d (diff) | |
Merge viewer-bear and become version 3.7.16
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rwxr-xr-x | indra/newview/llviewertexture.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 3f6d244af1..4e2eef39d6 100755 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1480,17 +1480,6 @@ void LLViewerFetchedTexture::processTextureStats() { mDesiredDiscardLevel = 0; } - else if (mDontDiscard && (mBoostLevel == LLGLTexture::BOOST_UI || mBoostLevel == LLGLTexture::BOOST_ICON)) - { - if (mFullWidth > MAX_IMAGE_SIZE_DEFAULT || mFullHeight > MAX_IMAGE_SIZE_DEFAULT) - { - mDesiredDiscardLevel = 1; // MAX_IMAGE_SIZE_DEFAULT = 1024 and max size ever is 2048 - } - else - { - mDesiredDiscardLevel = 0; - } - } else if(!mFullWidth || !mFullHeight) { mDesiredDiscardLevel = llmin(getMaxDiscardLevel(), (S32)mLoadedCallbackDesiredDiscardLevel); |