summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorEugene Mutavchi <emutavchi@productengine.com>2010-04-01 11:32:51 +0300
committerEugene Mutavchi <emutavchi@productengine.com>2010-04-01 11:32:51 +0300
commit7f38ea147466b6d045c90d710402b2ac321dbfd9 (patch)
tree5b5ff18ce2bbeb2dd22ec7dd7dfd3c3beee16a97 /indra/llui
parent7263906f495407cdb49c80b2ad17f845fa2f1c81 (diff)
Fixed normal bug EXT-6659("Ctrl+A" combination allows selecting of several picks) - added check that multiple selection is allowed
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/146/ --HG-- branch : product-engine
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llflatlistview.cpp5
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();