From 7f38ea147466b6d045c90d710402b2ac321dbfd9 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Thu, 1 Apr 2010 11:32:51 +0300
Subject: 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
---
 indra/llui/llflatlistview.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'indra/llui')

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();
-- 
cgit v1.2.3