Merge main into inventory_favorites

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

1 files changed, 60 insertions, 60 deletions

diff --git a/indra/llui/llmultifloater.h b/indra/llui/llmultifloater.h
index c106a62527..f2d83f4449 100644
--- a/indra/llui/llmultifloater.h
+++ b/indra/llui/llmultifloater.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llmultifloater.h
  * @brief LLFloater that hosts other floaters
  *
  * $LicenseInfo:firstyear=2002&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$
  */
@@ -38,65 +38,65 @@
 class LLMultiFloater : public LLFloater
 {
 public:
-	LLMultiFloater(const LLSD& key, const Params& params = getDefaultParams());
-	virtual ~LLMultiFloater() {};
-	
-	void buildTabContainer();
-	
-	virtual BOOL postBuild();
-	/*virtual*/ void onClose(bool app_quitting);
-	virtual void draw();
-	virtual void setVisible(BOOL visible);
-	/*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
-	/*virtual*/ bool addChild(LLView* view, S32 tab_group = 0);
-
-	virtual void setCanResize(BOOL can_resize);
-	virtual void growToFit(S32 content_width, S32 content_height);
-	virtual void addFloater(LLFloater* floaterp, BOOL select_added_floater, LLTabContainer::eInsertionPoint insertion_point = LLTabContainer::END);
-
-	virtual void showFloater(LLFloater* floaterp, LLTabContainer::eInsertionPoint insertion_point = LLTabContainer::END);
-	virtual void removeFloater(LLFloater* floaterp);
-
-	virtual void tabOpen(LLFloater* opened_floater, bool from_click);
-	virtual void tabClose();
-
-	virtual BOOL selectFloater(LLFloater* floaterp);
-	virtual void selectNextFloater();
-	virtual void selectPrevFloater();
-
-	virtual LLFloater*	getActiveFloater();
-	virtual BOOL		isFloaterFlashing(LLFloater* floaterp);
-	virtual S32			getFloaterCount();
-
-	virtual void setFloaterFlashing(LLFloater* floaterp, BOOL flashing);
-	virtual BOOL closeAllFloaters();	//Returns FALSE if the floater could not be closed due to pending confirmation dialogs
-	void setTabContainer(LLTabContainer* tab_container) { if (!mTabContainer) mTabContainer = tab_container; }
-	void onTabSelected();
-
-	virtual void updateResizeLimits();
-	virtual void updateFloaterTitle(LLFloater* floaterp);
+    LLMultiFloater(const LLSD& key, const Params& params = getDefaultParams());
+    virtual ~LLMultiFloater() {};
+
+    void buildTabContainer();
+
+    virtual BOOL postBuild();
+    /*virtual*/ void onClose(bool app_quitting);
+    virtual void draw();
+    virtual void setVisible(BOOL visible);
+    /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
+    /*virtual*/ bool addChild(LLView* view, S32 tab_group = 0);
+
+    virtual void setCanResize(BOOL can_resize);
+    virtual void growToFit(S32 content_width, S32 content_height);
+    virtual void addFloater(LLFloater* floaterp, BOOL select_added_floater, LLTabContainer::eInsertionPoint insertion_point = LLTabContainer::END);
+
+    virtual void showFloater(LLFloater* floaterp, LLTabContainer::eInsertionPoint insertion_point = LLTabContainer::END);
+    virtual void removeFloater(LLFloater* floaterp);
+
+    virtual void tabOpen(LLFloater* opened_floater, bool from_click);
+    virtual void tabClose();
+
+    virtual BOOL selectFloater(LLFloater* floaterp);
+    virtual void selectNextFloater();
+    virtual void selectPrevFloater();
+
+    virtual LLFloater*  getActiveFloater();
+    virtual BOOL        isFloaterFlashing(LLFloater* floaterp);
+    virtual S32         getFloaterCount();
+
+    virtual void setFloaterFlashing(LLFloater* floaterp, BOOL flashing);
+    virtual BOOL closeAllFloaters();    //Returns FALSE if the floater could not be closed due to pending confirmation dialogs
+    void setTabContainer(LLTabContainer* tab_container) { if (!mTabContainer) mTabContainer = tab_container; }
+    void onTabSelected();
+
+    virtual void updateResizeLimits();
+    virtual void updateFloaterTitle(LLFloater* floaterp);
 
 protected:
-	struct LLFloaterData
-	{
-		S32		    mWidth;
-		S32		    mHeight;
-		BOOL	    mCanMinimize;
-		BOOL	    mCanResize;
-		BOOL        mSaveRect;
-	};
-
-	LLTabContainer*		mTabContainer;
-	
-	typedef std::map<LLHandle<LLFloater>, LLFloaterData> floater_data_map_t;
-	floater_data_map_t	mFloaterDataMap;
-	
-	LLTabContainer::TabPosition mTabPos;
-	BOOL				mAutoResize;
-	S32					mOrigMinWidth, mOrigMinHeight;  // logically const but initialized late
+    struct LLFloaterData
+    {
+        S32         mWidth;
+        S32         mHeight;
+        BOOL        mCanMinimize;
+        BOOL        mCanResize;
+        BOOL        mSaveRect;
+    };
+
+    LLTabContainer*     mTabContainer;
+
+    typedef std::map<LLHandle<LLFloater>, LLFloaterData> floater_data_map_t;
+    floater_data_map_t  mFloaterDataMap;
+
+    LLTabContainer::TabPosition mTabPos;
+    BOOL                mAutoResize;
+    S32                 mOrigMinWidth, mOrigMinHeight;  // logically const but initialized late
 
 private:
-	virtual void computeResizeLimits(S32& new_min_width, S32& new_min_height);
+    virtual void computeResizeLimits(S32& new_min_width, S32& new_min_height);
 };
 
 #endif  // LL_MULTI_FLOATER_H