summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistcolumn.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-11-30 16:40:18 -0800
committerLeyla Farazha <leyla@lindenlab.com>2010-11-30 16:40:18 -0800
commit6e62c6c410df9001b56ffd57c6c6d8cd9fe035e6 (patch)
tree22a77be7720c4ea9cf9a17f70b00b14f68122454 /indra/llui/llscrolllistcolumn.cpp
parentc489f33169bdf88df24c430c278038b2f5a0630a (diff)
parentb778ba9b882ecb03e61b3b9bd833618ca096f5da (diff)
Merge
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();