diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:46:19 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:46:19 -0500 |
| commit | 36954908632d6f5366f6517023676c1bcd71aa17 (patch) | |
| tree | 3c46d7c43e474ba71596ebec5730cf0f0ed72a1a /indra/llui/llscrolllistcolumn.cpp | |
| parent | c6302cfbc750171ef536426d40e966e43e3aedc9 (diff) | |
| parent | 375d91019eefa0f2bc4f4685fb0f34dac987b189 (diff) | |
merge fixes for STORM-432
Diffstat (limited to 'indra/llui/llscrolllistcolumn.cpp')
| -rw-r--r-- | indra/llui/llscrolllistcolumn.cpp | 9 |
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(); |