summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-07-13 18:55:35 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-07-13 18:55:35 +0300
commit83e4862f9918037fc89e527d5f8f5b26323f30f0 (patch)
treeaac99027a32051612fb738f86a88c2de02e8f09a
parentba1123e3e482fdd061095c1374a41f8d007fbc22 (diff)
parent4965f9f2d5da84d3b60ccb1bc63497fdbfa99e51 (diff)
merge
--HG-- branch : product-engine
-rw-r--r--indra/llui/llflatlistview.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index a80a3f206f..ef962ac274 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -610,8 +610,14 @@ void LLFlatListView::onItemMouseClick(item_pair_t* item_pair, MASK mask)
return;
}
- if (!(mask & MASK_CONTROL) || !mMultipleSelection) resetSelection();
- selectItemPair(item_pair, select_item);
+ //no need to do additional commit on selection reset
+ if (!(mask & MASK_CONTROL) || !mMultipleSelection) resetSelection(true);
+
+ //only CTRL usage allows to deselect an item, usual clicking on an item cannot deselect it
+ if (mask & MASK_CONTROL)
+ selectItemPair(item_pair, select_item);
+ else
+ selectItemPair(item_pair, true);
}
void LLFlatListView::onItemRightMouseClick(item_pair_t* item_pair, MASK mask)