diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-12-18 16:34:49 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-12-18 16:34:49 -0800 |
| commit | eb4238e717e2d155672a2b5a30822cd7619a94c0 (patch) | |
| tree | 702956956368da77b488c89daa840c024766d0ca /indra/newview/llviewertexture.cpp | |
| parent | aa7efb7540d9eed9d8832bb65c52c3fdb1b811c8 (diff) | |
| parent | 90548a46ce49f510a29f0490fea1e3853d6affc3 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index b45148a186..ae9db94000 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1497,7 +1497,8 @@ F32 LLViewerFetchedTexture::calcDecodePriority() { priority += 10000000.f; } - else if(mAdditionalDecodePriority > 0.0f) + + if(mAdditionalDecodePriority > 0.0f) { // 1-9 S32 additional_priority = (S32)(1.0f + mAdditionalDecodePriority*8.0f + .5f); // round |