Merge main into inventory_favorites

# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/llui/llctrlselectioninterface.cpp b/indra/llui/llctrlselectioninterface.cpp
index 7e886aff48..10e5a75bff 100644
--- a/indra/llui/llctrlselectioninterface.cpp
+++ b/indra/llui/llctrlselectioninterface.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llctrlselectioninterface.cpp
  * @brief Programmatic selection of items in a list.
  *
  * $LicenseInfo:firstyear=2006&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, 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.
- * 
+ *
  * 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.
- * 
+ *
  * 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
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -35,12 +35,12 @@ LLCtrlSelectionInterface::~LLCtrlSelectionInterface()
 
 BOOL LLCtrlSelectionInterface::selectByValue(LLSD value)
 {
-	return setSelectedByValue(value, TRUE);
+    return setSelectedByValue(value, TRUE);
 }
 
 BOOL LLCtrlSelectionInterface::deselectByValue(LLSD value)
-{ 
-	return setSelectedByValue(value, FALSE); 
+{
+    return setSelectedByValue(value, FALSE);
 }
 
 
@@ -50,12 +50,12 @@ LLCtrlListInterface::~LLCtrlListInterface()
 
 LLScrollListItem* LLCtrlListInterface::addSimpleElement(const std::string& value)
 {
-	return addSimpleElement(value, ADD_BOTTOM, LLSD());
+    return addSimpleElement(value, ADD_BOTTOM, LLSD());
 }
 
 LLScrollListItem* LLCtrlListInterface::addSimpleElement(const std::string& value, EAddPosition pos)
 {
-	return addSimpleElement(value, pos, LLSD());
+    return addSimpleElement(value, pos, LLSD());
 }
 
 // virtual