diff options
author | Oz Linden <oz@lindenlab.com> | 2018-05-29 11:49:46 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2018-05-29 11:49:46 -0400 |
commit | c18a4cb0117b6e865a72a01465606c67a7e3bf6d (patch) | |
tree | 25abf867eabd03b7804a1e36e9c9af2513636cc7 /indra/newview/lltextureview.cpp | |
parent | 77344afa8b39b4c1fcebda4de63998a67fd4debb (diff) | |
parent | c70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff) |
merge changes for 5.1.4-release
Diffstat (limited to 'indra/newview/lltextureview.cpp')
-rw-r--r-- | indra/newview/lltextureview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index 6da13da58c..d7b95db94f 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -173,9 +173,9 @@ void LLTextureBar::draw() { color = LLColor4::green4; } - else if (mImagep->getBoostLevel() > LLGLTexture::BOOST_NONE) + else if (mImagep->getBoostLevel() > LLGLTexture::BOOST_ALM) { - color = LLColor4::magenta; + color = LLColor4::magenta; // except none and alm } else if (mImagep->getDecodePriority() <= 0.0f) { |