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, 72 insertions, 72 deletions

diff --git a/indra/llui/lldraghandle.h b/indra/llui/lldraghandle.h
index e095e577b1..f61dae8dc3 100644
--- a/indra/llui/lldraghandle.h
+++ b/indra/llui/lldraghandle.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lldraghandle.h
  * @brief LLDragHandle base class
  *
  * $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$
  */
@@ -39,64 +39,64 @@ class LLTextBox;
 class LLDragHandle : public LLView
 {
 public:
-	struct Params 
-	:	public LLInitParam::Block<Params, LLView::Params>
-	{
-		Optional<std::string> label;
-		Optional<LLUIColor> drag_highlight_color;
-		Optional<LLUIColor> drag_shadow_color;
-		
-		Params() 
-		:	label("label"),	
-			drag_highlight_color("drag_highlight_color", LLUIColorTable::instance().getColor("DefaultHighlightLight")),
-			drag_shadow_color("drag_shadow_color", LLUIColorTable::instance().getColor("DefaultShadowDark"))
-		{
-			changeDefault(mouse_opaque, true);
-			changeDefault(follows.flags, FOLLOWS_ALL);
-		}
-	};
-	void initFromParams(const Params&);
-	
-	virtual ~LLDragHandle();
-
-	virtual void setValue(const LLSD& value);
-
-	void			setForeground(BOOL b)		{ mForeground = b; }
-	BOOL			getForeground() const		{ return mForeground; }
-	void			setMaxTitleWidth(S32 max_width) {mMaxTitleWidth = llmin(max_width, mMaxTitleWidth); }
-	S32				getMaxTitleWidth() const { return mMaxTitleWidth; }
-	void			setButtonsRect(const LLRect& rect){ mButtonsRect = rect; }
-	LLRect			getButtonsRect() { return mButtonsRect; }
-	void			setTitleVisible(BOOL visible);
-
-	virtual void	setTitle( const std::string& title ) = 0;
-	virtual std::string	getTitle() const = 0;
-
-	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
+    struct Params
+    :   public LLInitParam::Block<Params, LLView::Params>
+    {
+        Optional<std::string> label;
+        Optional<LLUIColor> drag_highlight_color;
+        Optional<LLUIColor> drag_shadow_color;
+
+        Params()
+        :   label("label"),
+            drag_highlight_color("drag_highlight_color", LLUIColorTable::instance().getColor("DefaultHighlightLight")),
+            drag_shadow_color("drag_shadow_color", LLUIColorTable::instance().getColor("DefaultShadowDark"))
+        {
+            changeDefault(mouse_opaque, true);
+            changeDefault(follows.flags, FOLLOWS_ALL);
+        }
+    };
+    void initFromParams(const Params&);
+
+    virtual ~LLDragHandle();
+
+    virtual void setValue(const LLSD& value);
+
+    void            setForeground(BOOL b)       { mForeground = b; }
+    BOOL            getForeground() const       { return mForeground; }
+    void            setMaxTitleWidth(S32 max_width) {mMaxTitleWidth = llmin(max_width, mMaxTitleWidth); }
+    S32             getMaxTitleWidth() const { return mMaxTitleWidth; }
+    void            setButtonsRect(const LLRect& rect){ mButtonsRect = rect; }
+    LLRect          getButtonsRect() { return mButtonsRect; }
+    void            setTitleVisible(BOOL visible);
+
+    virtual void    setTitle( const std::string& title ) = 0;
+    virtual std::string getTitle() const = 0;
+
+    virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
+    virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
+    virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask);
 
 protected:
-	LLDragHandle(const Params&);
-	friend class LLUICtrlFactory;
-	
+    LLDragHandle(const Params&);
+    friend class LLUICtrlFactory;
+
 protected:
-	LLTextBox*		mTitleBox;
-	
+    LLTextBox*      mTitleBox;
+
 private:
-	LLRect			mButtonsRect;
-	S32				mDragLastScreenX;
-	S32				mDragLastScreenY;
-	S32				mLastMouseScreenX;
-	S32				mLastMouseScreenY;
-	LLCoordGL		mLastMouseDir;
-	LLUIColor		mDragHighlightColor;
-	LLUIColor		mDragShadowColor;
-	S32				mMaxTitleWidth;
-	BOOL			mForeground;
-
-	// Pixels near the edge to snap floaters.
-	static S32		sSnapMargin;
+    LLRect          mButtonsRect;
+    S32             mDragLastScreenX;
+    S32             mDragLastScreenY;
+    S32             mLastMouseScreenX;
+    S32             mLastMouseScreenY;
+    LLCoordGL       mLastMouseDir;
+    LLUIColor       mDragHighlightColor;
+    LLUIColor       mDragShadowColor;
+    S32             mMaxTitleWidth;
+    BOOL            mForeground;
+
+    // Pixels near the edge to snap floaters.
+    static S32      sSnapMargin;
 };
 
 
@@ -105,16 +105,16 @@ class LLDragHandleTop
 : public LLDragHandle
 {
 protected:
-	LLDragHandleTop(const Params& p) : LLDragHandle(p) {}
-	friend class LLUICtrlFactory;
+    LLDragHandleTop(const Params& p) : LLDragHandle(p) {}
+    friend class LLUICtrlFactory;
 public:
-	virtual void	setTitle( const std::string& title );
-	virtual std::string getTitle() const;
-	virtual void	draw();
-	virtual void	reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+    virtual void    setTitle( const std::string& title );
+    virtual std::string getTitle() const;
+    virtual void    draw();
+    virtual void    reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
 private:
-	void	reshapeTitleBox();
+    void    reshapeTitleBox();
 };
 
 
@@ -123,13 +123,13 @@ class LLDragHandleLeft
 : public LLDragHandle
 {
 protected:
-	LLDragHandleLeft(const Params& p) : LLDragHandle(p) {}
-	friend class LLUICtrlFactory;
+    LLDragHandleLeft(const Params& p) : LLDragHandle(p) {}
+    friend class LLUICtrlFactory;
 public:
-	virtual void	setTitle( const std::string& title );
-	virtual std::string getTitle() const;
-	virtual void	draw();
-	virtual void	reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+    virtual void    setTitle( const std::string& title );
+    virtual std::string getTitle() const;
+    virtual void    draw();
+    virtual void    reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
 };