merge from viewer-public

3 files changed, 60 insertions, 22 deletions

diff --git a/indra/llui/llfiltereditor.cpp b/indra/llui/llfiltereditor.cpp
index d62874d793..6c80275713 100644
--- a/indra/llui/llfiltereditor.cpp
+++ b/indra/llui/llfiltereditor.cpp
@@ -2,25 +2,31 @@
  * @file llfiltereditor.cpp
  * @brief LLFilterEditor implementation
  *
- * $LicenseInfo:firstyear=2001&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
  * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
  * $/LicenseInfo$
  */
 
diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp
index bea2572ff8..6bd16c9ee6 100644
--- a/indra/llui/llflatlistview.cpp
+++ b/indra/llui/llflatlistview.cpp
@@ -379,6 +379,7 @@ LLFlatListView::LLFlatListView(const LLFlatListView::Params& p)
   , mCommitOnSelectionChange(false)
   , mPrevNotifyParentRect(LLRect())
   , mNoItemsCommentTextbox(NULL)
+  , mIsConsecutiveSelection(false)
 {
 	mBorderThickness = getBorderWidth();
 
@@ -536,6 +537,7 @@ void LLFlatListView::onItemMouseClick(item_pair_t* item_pair, MASK mask)
 			return;
 
 		bool grab_items = false;
+		bool reverse = false;
 		pairs_list_t pairs_to_select;
 
 		// Pick out items from list between last selected and current clicked item_pair.
@@ -547,6 +549,8 @@ void LLFlatListView::onItemMouseClick(item_pair_t* item_pair, MASK mask)
 			item_pair_t* cur = *iter;
 			if (cur == last_selected_pair || cur == item_pair)
 			{
+				// We've got reverse selection if last grabed item isn't a new selection.
+				reverse = grab_items && (cur != item_pair);
 				grab_items = !grab_items;
 				// Skip last selected and current clicked item pairs.
 				continue;
@@ -562,26 +566,35 @@ void LLFlatListView::onItemMouseClick(item_pair_t* item_pair, MASK mask)
 			}
 		}
 
-		if (select_item)
+		if (reverse)
 		{
-			pairs_to_select.push_back(item_pair);
+			pairs_to_select.reverse();
 		}
 
+		pairs_to_select.push_back(item_pair);
+
 		for (pairs_iterator_t
 				 iter = pairs_to_select.begin(),
 				 iter_end = pairs_to_select.end();
 			 iter != iter_end; ++iter)
 		{
 			item_pair_t* pair_to_select = *iter;
-			selectItemPair(pair_to_select, true);
+			if (isSelected(pair_to_select))
+			{
+				// Item was already selected but there is a need to keep order from last selected pair to new selection.
+				// Do it here to prevent extra mCommitOnSelectionChange in selectItemPair().
+				mSelectedItemPairs.remove(pair_to_select);
+				mSelectedItemPairs.push_back(pair_to_select);
+			}
+			else
+			{
+				selectItemPair(pair_to_select, true);
+			}
 		}
 
 		if (!select_item)
 		{
-			// Item was already selected but there is a need to update last selected item and its border.
-			// Do it here to prevent extra mCommitOnSelectionChange in selectItemPair().
-			mSelectedItemPairs.remove(item_pair);
-			mSelectedItemPairs.push_back(item_pair);
+			// Update last selected item border.
 			mSelectedItemsBorder->setRect(getLastSelectedItemRect().stretch(-1));
 		}
 		return;
@@ -749,6 +762,8 @@ bool LLFlatListView::selectItemPair(item_pair_t* item_pair, bool select)
 
 	// Stretch selected item rect to ensure it won't be clipped
 	mSelectedItemsBorder->setRect(getLastSelectedItemRect().stretch(-1));
+	// By default mark it as not consecutive selection
+	mIsConsecutiveSelection = false;
 
 	return true;
 }
@@ -823,6 +838,17 @@ bool LLFlatListView::selectNextItemPair(bool is_up_direction, bool reset_selecti
 	if ( 0 == size() )
 		return false;
 
+	if (!mIsConsecutiveSelection)
+	{
+		// Leave only one item selected if list has not consecutive selection
+		if (mSelectedItemPairs.size() && !reset_selection)
+		{
+			item_pair_t* cur_sel_pair = mSelectedItemPairs.back();
+			resetSelection();
+			selectItemPair (cur_sel_pair, true);
+		}
+	}
+
 	if ( mSelectedItemPairs.size() )
 	{
 		item_pair_t* to_sel_pair = NULL;
@@ -877,6 +903,8 @@ bool LLFlatListView::selectNextItemPair(bool is_up_direction, bool reset_selecti
 			}
 			// Select/Deselect next item
 			selectItemPair(select ? to_sel_pair : cur_sel_pair, select);
+			// Mark it as consecutive selection
+			mIsConsecutiveSelection = true;
 			return true;
 		}
 	}
@@ -888,6 +916,8 @@ bool LLFlatListView::selectNextItemPair(bool is_up_direction, bool reset_selecti
 			selectLastItem();
 		else
 			selectFirstItem();
+		// Mark it as consecutive selection
+		mIsConsecutiveSelection = true;
 		return true;
 	}
 
diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h
index 6395805aab..f4e0426f15 100644
--- a/indra/llui/llflatlistview.h
+++ b/indra/llui/llflatlistview.h
@@ -410,6 +410,8 @@ private:
 
 	bool mKeepOneItemSelected;
 
+	bool mIsConsecutiveSelection;
+
 	/** All pairs of the list */
 	pairs_list_t mItemPairs;