Merge main into inventory_favorites

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

1 files changed, 14 insertions, 14 deletions

diff --git a/indra/newview/llsaveoutfitcombobtn.h b/indra/newview/llsaveoutfitcombobtn.h
index 3987a99f51..e99cb22cac 100644
--- a/indra/newview/llsaveoutfitcombobtn.h
+++ b/indra/newview/llsaveoutfitcombobtn.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llsaveoutfitcombobtn.h
  * @brief Represents outfit save/save as combo button.
  *
  * $LicenseInfo:firstyear=2010&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$
  */
@@ -36,19 +36,19 @@ class LLButton;
  */
 class LLSaveOutfitComboBtn
 {
-	LOG_CLASS(LLSaveOutfitComboBtn);
+    LOG_CLASS(LLSaveOutfitComboBtn);
 public:
-	LLSaveOutfitComboBtn(LLPanel* parent, bool saveAsDefaultAction = false);
+    LLSaveOutfitComboBtn(LLPanel* parent, bool saveAsDefaultAction = false);
 
-	void showSaveMenu();
-	void saveOutfit(bool as_new = false);
-	void setMenuItemEnabled(const std::string& item, bool enabled);
-	void setSaveBtnEnabled(bool enabled);
+    void showSaveMenu();
+    void saveOutfit(bool as_new = false);
+    void setMenuItemEnabled(const std::string& item, bool enabled);
+    void setSaveBtnEnabled(bool enabled);
 
 private:
-	bool mSaveAsDefaultAction;
-	LLPanel* mParent;
-	LLToggleableMenu* mSaveMenu;
+    bool mSaveAsDefaultAction;
+    LLPanel* mParent;
+    LLToggleableMenu* mSaveMenu;
 };
 
 #endif // LL_LLSAVEOUTFITCOMBOBTN_H