Merge main into inventory_favorites

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

1 files changed, 15 insertions, 15 deletions

diff --git a/indra/newview/llpanelappearancetab.h b/indra/newview/llpanelappearancetab.h
index 3d049b7e5c..e088c3e6f0 100644
--- a/indra/newview/llpanelappearancetab.h
+++ b/indra/newview/llpanelappearancetab.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpanelappearancetab.h
  * @brief Tabs interface for Side Bar "My Appearance" panel
  *
  * $LicenseInfo:firstyear=2009&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$
  */
@@ -34,20 +34,20 @@ class LLToggleableMenu;
 class LLPanelAppearanceTab : public LLPanel
 {
 public:
-	LLPanelAppearanceTab() : LLPanel() {}
-	virtual ~LLPanelAppearanceTab() {}
+    LLPanelAppearanceTab() : LLPanel() {}
+    virtual ~LLPanelAppearanceTab() {}
 
-	void setFilterSubString(const std::string& new_string);
+    void setFilterSubString(const std::string& new_string);
 
     void checkFilterSubString();
 
     virtual void onFilterSubStringChanged(const std::string& new_string, const std::string& old_string) = 0;
 
-	virtual bool isActionEnabled(const LLSD& userdata) = 0;
+    virtual bool isActionEnabled(const LLSD& userdata) = 0;
 
-	virtual void getSelectedItemsUUIDs(uuid_vec_t& selected_uuids) const {}
+    virtual void getSelectedItemsUUIDs(uuid_vec_t& selected_uuids) const {}
 
-	const std::string& getFilterSubString() { return mFilterSubString; }
+    const std::string& getFilterSubString() { return mFilterSubString; }
 
     virtual void updateMenuItemsVisibility() = 0;
     virtual LLToggleableMenu* getGearMenu() = 0;
@@ -56,10 +56,10 @@ public:
 
 protected:
 
-	/**
-	 * Returns true if there are any items that can be taken off among currently selected, otherwise false.
-	 */
-	bool canTakeOffSelected();
+    /**
+     * Returns true if there are any items that can be taken off among currently selected, otherwise false.
+     */
+    bool canTakeOffSelected();
 
 private:
     std::string mFilterSubString;