summaryrefslogtreecommitdiff
path: root/indra/newview/lltextureview.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-06-26 09:12:08 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-06-26 09:12:08 -0400
commit3a7513b5875b86c247dd49fe78b8fab955ba5e0a (patch)
tree3f942d50b41fd090550541af01bb50d23d845c09 /indra/newview/lltextureview.cpp
parent06954294b8739dd51abe75e3710da6e496b353d4 (diff)
parentdc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff)
DRTVWR-453: Merge up to latest viewer-release.
Diffstat (limited to 'indra/newview/lltextureview.cpp')
-rw-r--r--indra/newview/lltextureview.cpp4
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)
{