diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-10-13 20:12:28 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-10-13 20:12:28 -0600 |
| commit | dedc78431f938beac5c8750ff446eeab44aeb163 (patch) | |
| tree | bca57d552f309d89d9dde9aef2ba6e89bb9ff3e8 /indra/newview/llviewertexture.cpp | |
| parent | ded6a78541d9f779b5cbef0d1255588b93d5dce6 (diff) | |
| parent | 22958ae80351f33287c978b9896258d460f722dc (diff) | |
Automated merge with http://bitbucket.org/seraph/viewer-development-shining
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -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 { |