Merge main into inventory_favorites

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

1 files changed, 23 insertions, 23 deletions

diff --git a/indra/llui/llflyoutbutton.h b/indra/llui/llflyoutbutton.h
index 36998eba2e..c217d14ff1 100644
--- a/indra/llui/llflyoutbutton.h
+++ b/indra/llui/llflyoutbutton.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llflyoutbutton.h
  * @brief LLFlyoutButton base class
  *
  * $LicenseInfo:firstyear=2001&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$
  */
@@ -37,32 +37,32 @@
 class LLFlyoutButton : public LLComboBox
 {
 public:
-	struct Params : public LLInitParam::Block<Params, LLComboBox::Params>
-	{
-		Optional<LLButton::Params> action_button;
-		Deprecated                 allow_text_entry;
+    struct Params : public LLInitParam::Block<Params, LLComboBox::Params>
+    {
+        Optional<LLButton::Params> action_button;
+        Deprecated                 allow_text_entry;
 
-		Params()
-		:	action_button("action_button"),
-		    allow_text_entry("allow_text_entry")
-		{
-			changeDefault(LLComboBox::Params::allow_text_entry, false);
-		}
+        Params()
+        :   action_button("action_button"),
+            allow_text_entry("allow_text_entry")
+        {
+            changeDefault(LLComboBox::Params::allow_text_entry, false);
+        }
 
-	};
+    };
 protected:
-	LLFlyoutButton(const Params&);
-	friend class LLUICtrlFactory;
+    LLFlyoutButton(const Params&);
+    friend class LLUICtrlFactory;
 public:
-	virtual void	draw();
+    virtual void    draw();
 
-	void setToggleState(BOOL state);
+    void setToggleState(BOOL state);
 
-	void onActionButtonClick(const LLSD& data);
+    void onActionButtonClick(const LLSD& data);
 
 protected:
-	LLButton*				mActionButton;
-	BOOL					mToggleState;
+    LLButton*               mActionButton;
+    BOOL                    mToggleState;
 };
 
 #endif // LL_LLFLYOUTBUTTON_H