Merge main into inventory_favorites

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

1 files changed, 45 insertions, 45 deletions

diff --git a/indra/newview/llpaneloutfitsinventory.h b/indra/newview/llpaneloutfitsinventory.h
index df81333349..3d8c7316be 100644
--- a/indra/newview/llpaneloutfitsinventory.h
+++ b/indra/newview/llpaneloutfitsinventory.h
@@ -6,21 +6,21 @@
  * $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$
  */
@@ -43,25 +43,25 @@ class LLTabContainer;
 
 class LLPanelOutfitsInventory : public LLPanel
 {
-	LOG_CLASS(LLPanelOutfitsInventory);
+    LOG_CLASS(LLPanelOutfitsInventory);
 public:
-	LLPanelOutfitsInventory();
-	virtual ~LLPanelOutfitsInventory();
+    LLPanelOutfitsInventory();
+    virtual ~LLPanelOutfitsInventory();
+
+    /*virtual*/ BOOL postBuild();
+    /*virtual*/ void onOpen(const LLSD& key);
+
+    void onSearchEdit(const std::string& string);
+    void onSave();
+    void saveOutfit(bool as_new = false);
 
-	/*virtual*/ BOOL postBuild();
-	/*virtual*/ void onOpen(const LLSD& key);
-	
-	void onSearchEdit(const std::string& string);
-	void onSave();
-	void saveOutfit(bool as_new = false);
-	
-	bool onSaveCommit(const LLSD& notification, const LLSD& response);
+    bool onSaveCommit(const LLSD& notification, const LLSD& response);
 
-	static LLSidepanelAppearance* getAppearanceSP();
+    static LLSidepanelAppearance* getAppearanceSP();
 
-	static LLPanelOutfitsInventory* findInstance();
+    static LLPanelOutfitsInventory* findInstance();
 
-	void openApearanceTab(const std::string& tab_name);
+    void openApearanceTab(const std::string& tab_name);
 
     bool isCOFPanelActive() const;
 
@@ -73,46 +73,46 @@ public:
         LLPanel* trash_menu_panel);
 
 protected:
-	void updateVerbs();
+    void updateVerbs();
 
 private:
-	LLTabContainer*			mAppearanceTabs;
+    LLTabContainer*         mAppearanceTabs;
 
-	//////////////////////////////////////////////////////////////////////////////////
-	// tab panels                                                                   //
+    //////////////////////////////////////////////////////////////////////////////////
+    // tab panels                                                                   //
 protected:
-	void 					initTabPanels();
-	void 					onTabChange();
-	bool 					isOutfitsListPanelActive() const;
-	bool 					isOutfitsGalleryPanelActive() const;
+    void                    initTabPanels();
+    void                    onTabChange();
+    bool                    isOutfitsListPanelActive() const;
+    bool                    isOutfitsGalleryPanelActive() const;
 
 private:
-	LLPanelAppearanceTab*	mActivePanel;
-	LLOutfitsList*			mMyOutfitsPanel;
+    LLPanelAppearanceTab*   mActivePanel;
+    LLOutfitsList*          mMyOutfitsPanel;
     LLOutfitGallery*        mOutfitGalleryPanel;
-	LLPanelWearing*			mCurrentOutfitPanel;
+    LLPanelWearing*         mCurrentOutfitPanel;
 
-	// tab panels                                                                   //
-	//////////////////////////////////////////////////////////////////////////////////
+    // tab panels                                                                   //
+    //////////////////////////////////////////////////////////////////////////////////
 
-	//////////////////////////////////////////////////////////////////////////////////
-	// List Commands                                                                //
+    //////////////////////////////////////////////////////////////////////////////////
+    // List Commands                                                                //
 protected:
-	void initListCommandsHandlers();
-	void updateListCommands();
-	void onWearButtonClick();
-	void onTrashButtonClick();
+    void initListCommandsHandlers();
+    void updateListCommands();
+    void onWearButtonClick();
+    void onTrashButtonClick();
     void onGearMouseDown();
-	bool isActionEnabled(const LLSD& userdata);
-	void setWearablesLoading(bool val);
-	void onWearablesLoaded();
-	void onWearablesLoading();
+    bool isActionEnabled(const LLSD& userdata);
+    void setWearablesLoading(bool val);
+    void onWearablesLoaded();
+    void onWearablesLoading();
 private:
-	LLPanel*					mListCommands;
-	// List Commands                                                                //
-	//////////////////////////////////////////////////////////////////////////////////
+    LLPanel*                    mListCommands;
+    // List Commands                                                                //
+    //////////////////////////////////////////////////////////////////////////////////
 
-	bool mInitialized;
+    bool mInitialized;
 
     // not owned items
     LLMenuButton* mGearMenu;