Merge main into inventory_favorites

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

1 files changed, 29 insertions, 29 deletions

diff --git a/indra/newview/llpanelmarketplaceinbox.h b/indra/newview/llpanelmarketplaceinbox.h
index 952e3a333a..1393bc1efe 100644
--- a/indra/newview/llpanelmarketplaceinbox.h
+++ b/indra/newview/llpanelmarketplaceinbox.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpanelmarketplaceinbox.h
  * @brief Panel for marketplace inbox
  *
 * $LicenseInfo:firstyear=2011&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,44 +37,44 @@ class LLPanelMarketplaceInbox : public LLPanel
 {
 public:
 
-	struct Params :	public LLInitParam::Block<Params, LLPanel::Params>
-	{};
+    struct Params : public LLInitParam::Block<Params, LLPanel::Params>
+    {};
+
+    LOG_CLASS(LLPanelMarketplaceInbox);
+
+    // RN: for some reason you can't just use LLUICtrlFactory::getDefaultParams as a default argument in VC8
+    static const LLPanelMarketplaceInbox::Params& getDefaultParams();
 
-	LOG_CLASS(LLPanelMarketplaceInbox);
+    LLPanelMarketplaceInbox(const Params& p = getDefaultParams());
+    ~LLPanelMarketplaceInbox();
 
-	// RN: for some reason you can't just use LLUICtrlFactory::getDefaultParams as a default argument in VC8
-	static const LLPanelMarketplaceInbox::Params& getDefaultParams();
+    /*virtual*/ BOOL postBuild();
 
-	LLPanelMarketplaceInbox(const Params& p = getDefaultParams());
-	~LLPanelMarketplaceInbox();
+    /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg);
 
-	/*virtual*/ BOOL postBuild();
-	
-	/*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg);
+    /*virtual*/ void draw();
 
-	/*virtual*/ void draw();
-	
-	LLInventoryPanel * setupInventoryPanel();
+    LLInventoryPanel * setupInventoryPanel();
 
-	void onClearSearch();
-	void onFilterEdit(const std::string& search_string);
+    void onClearSearch();
+    void onFilterEdit(const std::string& search_string);
 
-	U32 getFreshItemCount() const;
-	U32 getTotalItemCount() const;
+    U32 getFreshItemCount() const;
+    U32 getTotalItemCount() const;
 
-	std::string getBadgeString() const;
+    std::string getBadgeString() const;
 
 private:
 
-	void onSelectionChange();
+    void onSelectionChange();
 
-	void onFocusReceived();
+    void onFocusReceived();
 
 private:
-	LLUICtrl *			mFreshCountCtrl;
-	LLButton *			mInboxButton;
-	LLInventoryPanel *	mInventoryPanel;
-	LLSaveFolderState*			mSavedFolderState;
+    LLUICtrl *          mFreshCountCtrl;
+    LLButton *          mInboxButton;
+    LLInventoryPanel *  mInventoryPanel;
+    LLSaveFolderState*          mSavedFolderState;
 };