diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-01 17:54:08 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-01 17:54:08 -0400 |
| commit | 2854008e8edd3419fe37a8c4971223eda5945bfa (patch) | |
| tree | 83640a42fcc5f71200a19e173a95da433760cf74 /indra/llui/llflatlistview.cpp | |
| parent | 1ec47c39a6c4a6e7e518d0b91a87f50596362f06 (diff) | |
| parent | 406b595e8c6811c2550340ba316328289d8b856f (diff) | |
automated merge
Diffstat (limited to 'indra/llui/llflatlistview.cpp')
| -rw-r--r-- | indra/llui/llflatlistview.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp index bc34012267..d8084fd9aa 100644 --- a/indra/llui/llflatlistview.cpp +++ b/indra/llui/llflatlistview.cpp @@ -562,8 +562,7 @@ BOOL LLFlatListView::handleKeyHere(KEY key, MASK mask) { if(MASK_CONTROL & mask) { - selectAll(); - handled = TRUE; + handled = (BOOL)selectAll(); } break; } @@ -793,7 +792,7 @@ bool LLFlatListView::selectNextItemPair(bool is_up_direction, bool reset_selecti bool LLFlatListView::selectAll() { - if (!mAllowSelection) + if (!mAllowSelection || !mMultipleSelection) return false; mSelectedItemPairs.clear(); |