diff options
| author | skolb <none@none> | 2009-12-21 09:31:48 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-21 09:31:48 -0800 |
| commit | ec8738ac4501fd2158ca2ebeb146239f98dcd971 (patch) | |
| tree | c63d3222fbb5f8036b012c60e8622cd085fbe60d /indra/newview/llviewertexture.cpp | |
| parent | b910de4ad7f91bb2022bfb8304c3dea32c0a4857 (diff) | |
| parent | d894c7a0d8292ce2114e88f382dcf6187b0d2535 (diff) | |
Merge viewer 2-0 into media
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 |