diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-10-13 19:56:55 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-10-13 19:56:55 -0600 |
| commit | 03277635d03e8e7c2f73285743fdd9c77802d76f (patch) | |
| tree | 6da6ee9119081d87973c908ebbaf34b646759b54 /indra/newview | |
| parent | e403f402e9743099d03e286593f42651a01bad88 (diff) | |
merge REV-13dc54d03e13 from skylight: fix for EXP-195: Custom login progress screen blurry when first presented to user as the image fully loads
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 7ccd4828ba..f96b93da4d 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1130,7 +1130,7 @@ void LLViewerFetchedTexture::init(bool firstinit) // does not contain this image. mIsMissingAsset = FALSE; - mLoadedCallbackDesiredDiscardLevel = 0; + mLoadedCallbackDesiredDiscardLevel = S8_MAX; mPauseLoadedCallBacks = TRUE ; mNeedsCreateTexture = FALSE; @@ -1507,7 +1507,7 @@ void LLViewerFetchedTexture::processTextureStats() } else if(!mFullWidth || !mFullHeight) { - mDesiredDiscardLevel = getMaxDiscardLevel() ; + mDesiredDiscardLevel = llmin(getMaxDiscardLevel(), (S32)mLoadedCallbackDesiredDiscardLevel) ; } else { |