summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-11-24 14:04:03 -0800
committerMerov Linden <merov@lindenlab.com>2010-11-24 14:04:03 -0800
commit1a60b4448d6d29e002f8738ca44c44f3258a5b40 (patch)
tree61d806c7520d7e6a25958f60564d65197e8d9da5
parent12e4bdd4d6fd72c5248db3f0fd36bd19ca9b8182 (diff)
parent9bca4a330f96da635a74a38fd98b83847b84ac5e (diff)
STORM-491 : pull to viewer-development
-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();