diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-04-19 16:36:22 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-04-19 16:36:22 -0600 |
| commit | 8154a04f4864b9e88680dc5f5351579e916600e5 (patch) | |
| tree | 75986c798901ce29ea1e1d5231107565852c7067 /indra/newview | |
| parent | 2336188eeda9d074282886c610c918328e563fb7 (diff) | |
| parent | 202f16cdf81fe590a7b40334016a7374e0bbdad7 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index a5adb11c53..c883087cf2 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1564,10 +1564,6 @@ F32 LLViewerFetchedTexture::calcDecodePriority() // larger mips are corrupted priority = -3.0f; } - else if (cur_discard <= mDesiredDiscardLevel) - { - priority = -4.0f; - } else { // priority range = 100,000 - 500,000 |