summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistcolumn.cpp
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2010-11-27 13:08:00 +0000
committerTofu Buzzard <no-email>2010-11-27 13:08:00 +0000
commit31a109452d743af565f99029ec835e2f32261681 (patch)
tree07375d9174730e1deec3aedcc6333fe8426cd827 /indra/llui/llscrolllistcolumn.cpp
parentb3541777921142572f735c4b028e4fba91ae80a0 (diff)
parent2f83766bb71772eda19a4c7c61896c0fd7fae8a4 (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();