summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistcolumn.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-03 07:33:24 -0500
committerOz Linden <oz@lindenlab.com>2010-12-03 07:33:24 -0500
commit2491555272283340206f3532b9417ec07df40022 (patch)
tree62cd035d30bbc1689d2bf5fd11261487927b0754 /indra/llui/llscrolllistcolumn.cpp
parent039c0466f9759d7b966d8faf60945b3924d017a8 (diff)
parent36954908632d6f5366f6517023676c1bcd71aa17 (diff)
pull latest fixes back from viewer-beta
Diffstat (limited to 'indra/llui/llscrolllistcolumn.cpp')
-rw-r--r--indra/llui/llscrolllistcolumn.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llui/llscrolllistcolumn.cpp b/indra/llui/llscrolllistcolumn.cpp
index 2a4c1ca44c..696e4a2bb1 100644
--- a/indra/llui/llscrolllistcolumn.cpp
+++ b/indra/llui/llscrolllistcolumn.cpp
@@ -83,7 +83,14 @@ void LLScrollColumnHeader::draw()
&& (sort_column == mColumn->mSortingColumn || sort_column == mColumn->mName);
BOOL is_ascending = mColumn->mParentCtrl->getSortAscending();
- setImageOverlay(is_ascending ? "up_arrow.tga" : "down_arrow.tga", LLFontGL::RIGHT, draw_arrow ? LLColor4::white : LLColor4::transparent);
+ if (draw_arrow)
+ {
+ setImageOverlay(is_ascending ? "up_arrow.tga" : "down_arrow.tga", LLFontGL::RIGHT, LLColor4::white);
+ }
+ else
+ {
+ setImageOverlay(LLUUID::null);
+ }
// Draw children
LLButton::draw();