Merge main into inventory_favorites

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

1 files changed, 20 insertions, 20 deletions

diff --git a/indra/newview/lltoolobjpicker.h b/indra/newview/lltoolobjpicker.h
index a55cd223de..ceeb45c74e 100644
--- a/indra/newview/lltoolobjpicker.h
+++ b/indra/newview/lltoolobjpicker.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lltoolobjpicker.h
  * @brief LLToolObjPicker class header file
  *
  * $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$
  */
@@ -35,30 +35,30 @@ class LLPickInfo;
 
 class LLToolObjPicker : public LLTool, public LLSingleton<LLToolObjPicker>
 {
-	LLSINGLETON(LLToolObjPicker);
+    LLSINGLETON(LLToolObjPicker);
 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        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 void 		handleSelect() override;
-	virtual void 		handleDeselect() override;
+    virtual void        handleSelect() override;
+    virtual void        handleDeselect() override;
 
-	virtual void		onMouseCaptureLost() override;
+    virtual void        onMouseCaptureLost() override;
 
-	void 		setExitCallback(void (*callback)(void *), void *callback_data);
+    void        setExitCallback(void (*callback)(void *), void *callback_data);
 
-	LLUUID				getObjectID() const { return mHitObjectID; }
+    LLUUID              getObjectID() const { return mHitObjectID; }
 
-	static void			pickCallback(const LLPickInfo& pick_info);
+    static void         pickCallback(const LLPickInfo& pick_info);
 
 protected:
-	BOOL				mPicked;
-	LLUUID				mHitObjectID;
-	void 				(*mExitCallback)(void *callback_data);
-	void 				*mExitCallbackData;
+    BOOL                mPicked;
+    LLUUID              mHitObjectID;
+    void                (*mExitCallback)(void *callback_data);
+    void                *mExitCallbackData;
 };
 
 
-#endif  
+#endif