diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-03 17:09:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-03 17:09:22 -0500 |
| commit | 7549df0eaf347e9f490f9cfaf4950dd623a08237 (patch) | |
| tree | 2949dade42fc865c5abd83854b9f04529a01c581 /indra/llui/llscrolllistcolumn.cpp | |
| parent | 4f5b27c933c827b98886d6218908b83e85672e3e (diff) | |
| parent | 2491555272283340206f3532b9417ec07df40022 (diff) | |
merging beta fixes after 2.4.0-beta1
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(); |