diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-27 07:09:06 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-27 07:09:06 +0200 |
| commit | 5269c6e37c17eec5b662fd57d17e6a87fdccc421 (patch) | |
| tree | 284d4d9d9705facfd4cb8146d9790891ce3cfc91 /indra/llui | |
| parent | a243a0475e9bc87ec4acf31700443461ebc58a54 (diff) | |
| parent | 1a3c5e574bb262f4b334b1c00c671db346c1c658 (diff) | |
merge
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llfolderview.h | 1 | ||||
| -rwxr-xr-x | indra/llui/llfolderviewitem.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h index 487391a477..525efe425a 100644 --- a/indra/llui/llfolderview.h +++ b/indra/llui/llfolderview.h @@ -148,7 +148,6 @@ public: virtual BOOL changeSelection(LLFolderViewItem* selection, BOOL selected); virtual std::set<LLFolderViewItem*> getSelectionList() const; - S32 getNumSelectedItems() { return mSelectedItems.size(); } // Make sure if ancestor is selected, descendants are not void sanitizeSelection(); 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, |