diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 13:50:39 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 13:50:39 -0500 |
| commit | 5098ca5ae444ca492bc668fbd07976e96eb5726a (patch) | |
| tree | f392ec41ad1c3a44287dfff5efe6997962b9c4fc /indra/llui/llscrolllistcolumn.cpp | |
| parent | 37116479d299f23a289e39accc3899d6ea977203 (diff) | |
| parent | 6e62c6c410df9001b56ffd57c6c6d8cd9fe035e6 (diff) | |
merge fix for STORM-557
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(); |