Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 139 insertions, 139 deletions

diff --git a/indra/llui/lldraghandle.h b/indra/llui/lldraghandle.h
index bb5ee43a70..e7e9469acb 100644
--- a/indra/llui/lldraghandle.h
+++ b/indra/llui/lldraghandle.h
@@ -1,139 +1,139 @@
-/** 
- * @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$
- */
-
-// A widget for dragging a view around the screen using the mouse.
-
-#ifndef LL_DRAGHANDLE_H
-#define LL_DRAGHANDLE_H
-
-#include "llview.h"
-#include "v4color.h"
-#include "llrect.h"
-#include "llcoord.h"
-
-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);
-
-protected:
-	LLDragHandle(const Params&);
-	friend class LLUICtrlFactory;
-	
-protected:
-	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;
-};
-
-
-// Use this one for traditional top-of-window draggers
-class LLDragHandleTop
-: public LLDragHandle
-{
-protected:
-	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);
-
-private:
-	void	reshapeTitleBox();
-};
-
-
-// Use this for left-side, vertical text draggers
-class LLDragHandleLeft
-: public LLDragHandle
-{
-protected:
-	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);
-
-};
-
-const S32 DRAG_HANDLE_HEIGHT = 16;
-const S32 DRAG_HANDLE_WIDTH = 16;
-
-#endif  // LL_DRAGHANDLE_H
+/**

+ * @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$

+ */

+

+// A widget for dragging a view around the screen using the mouse.

+

+#ifndef LL_DRAGHANDLE_H

+#define LL_DRAGHANDLE_H

+

+#include "llview.h"

+#include "v4color.h"

+#include "llrect.h"

+#include "llcoord.h"

+

+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);

+

+protected:

+    LLDragHandle(const Params&);

+    friend class LLUICtrlFactory;

+

+protected:

+    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;

+};

+

+

+// Use this one for traditional top-of-window draggers

+class LLDragHandleTop

+: public LLDragHandle

+{

+protected:

+    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);

+

+private:

+    void    reshapeTitleBox();

+};

+

+

+// Use this for left-side, vertical text draggers

+class LLDragHandleLeft

+: public LLDragHandle

+{

+protected:

+    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);

+

+};

+

+const S32 DRAG_HANDLE_HEIGHT = 16;

+const S32 DRAG_HANDLE_WIDTH = 16;

+

+#endif  // LL_DRAGHANDLE_H