Merge branch 'main' into marchcat/x-b-merge

# Conflicts:
#	autobuild.xml
#	indra/cmake/ConfigurePkgConfig.cmake
#	indra/cmake/ICU4C.cmake
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
#	indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/lloutfitslist.cpp

1 files changed, 14 insertions, 14 deletions

diff --git a/indra/newview/lltoolface.h b/indra/newview/lltoolface.h
index 7c8ff20480..ff3eead6a6 100644
--- a/indra/newview/lltoolface.h
+++ b/indra/newview/lltoolface.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lltoolface.h
  * @brief A tool to select object faces
  *
  * $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$
  */
@@ -33,19 +33,19 @@ class LLViewerObject;
 class LLPickInfo;
 
 class LLToolFace
-:	public LLTool, public LLSingleton<LLToolFace>
+:   public LLTool, public LLSingleton<LLToolFace>
 {
-	LLSINGLETON(LLToolFace);
-	virtual ~LLToolFace();
+    LLSINGLETON(LLToolFace);
+    virtual ~LLToolFace();
 public:
 
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask) override;
-	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask) override;
-	virtual void	handleSelect() override;
-	virtual void	handleDeselect() override;
-	virtual void	render() override;			// draw face highlights
+    virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask) override;
+    virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask) override;
+    virtual void    handleSelect() override;
+    virtual void    handleDeselect() override;
+    virtual void    render() override;          // draw face highlights
 
-	static void pickCallback(const LLPickInfo& pick_info);
+    static void pickCallback(const LLPickInfo& pick_info);
 };
 
 #endif