summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-11-26 17:49:16 -0800
committerMerov Linden <merov@lindenlab.com>2012-11-26 17:49:16 -0800
commit1a3c5e574bb262f4b334b1c00c671db346c1c658 (patch)
tree75a5b915d09e5a3154e3ad56880577a8695aef5b /indra
parent8076f7a33d7f5ee93d4ba8f71a7ba0fed5e364a7 (diff)
CHUI-528, CHUI-536, CHUI-538, CHUI-540: Fixed the changed item's highlighting that broke multiselection in inventory and in conversations.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llui/llfolderviewitem.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 89c7e0d14a..261f53d6b6 100755
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -712,7 +712,7 @@ void LLFolderViewItem::drawHighlight(const BOOL showContent, const BOOL hasKeybo
}
}
- if (!isHighlightAllowed() || isHighlightActive())
+ if (isHighlightAllowed() || isHighlightActive())
{
gl_rect_2d(FOCUS_LEFT,
focus_top,
@@ -721,7 +721,7 @@ void LLFolderViewItem::drawHighlight(const BOOL showContent, const BOOL hasKeybo
bg_color, hasKeyboardFocus);
}
- if (mIsCurSelection)
+ if (isHighlightActive())
{
gl_rect_2d(FOCUS_LEFT,
focus_top,