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/newview/lltoolpipette.h b/indra/newview/lltoolpipette.h
index 2636811c66..44d06f5383 100644
--- a/indra/newview/lltoolpipette.h
+++ b/indra/newview/lltoolpipette.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lltoolpipette.h
  * @brief LLToolPipette class header file
  *
  * $LicenseInfo:firstyear=2006&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$
  */
@@ -41,30 +41,30 @@ class LLViewerObject;
 class LLPickInfo;
 
 class LLToolPipette
-:	public LLTool, public LLSingleton<LLToolPipette>
+:   public LLTool, public LLSingleton<LLToolPipette>
 {
-	LLSINGLETON(LLToolPipette);
-	virtual ~LLToolPipette();
+    LLSINGLETON(LLToolPipette);
+    virtual ~LLToolPipette();
 
 public:
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask) override;
-	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask) override;
-	virtual BOOL	handleHover(S32 x, S32 y, MASK mask) override;
-	virtual BOOL	handleToolTip(S32 x, S32 y, MASK mask) override;
+    virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask) override;
+    virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask) override;
+    virtual BOOL    handleHover(S32 x, S32 y, MASK mask) override;
+    virtual BOOL    handleToolTip(S32 x, S32 y, MASK mask) override;
+
+    // Note: Don't return connection; use boost::bind + boost::signals2::trackable to disconnect slots
+    typedef boost::signals2::signal<void (const LLTextureEntry& te)> signal_t;
+    void setToolSelectCallback(const signal_t::slot_type& cb) { mSignal.connect(cb); }
+    void setResult(BOOL success, const std::string& msg);
 
-	// Note: Don't return connection; use boost::bind + boost::signals2::trackable to disconnect slots
-	typedef boost::signals2::signal<void (const LLTextureEntry& te)> signal_t;
-	void setToolSelectCallback(const signal_t::slot_type& cb) { mSignal.connect(cb); }
-	void setResult(BOOL success, const std::string& msg);
-	
-	void setTextureEntry(const LLTextureEntry* entry);
-	static void pickCallback(const LLPickInfo& pick_info);
+    void setTextureEntry(const LLTextureEntry* entry);
+    static void pickCallback(const LLPickInfo& pick_info);
 
 protected:
-	LLTextureEntry	mTextureEntry;
-	signal_t		mSignal;
-	BOOL			mSuccess;
-	std::string		mTooltipMsg;
+    LLTextureEntry  mTextureEntry;
+    signal_t        mSignal;
+    BOOL            mSuccess;
+    std::string     mTooltipMsg;
 };
 
 #endif //LL_LLTOOLPIPETTE_H