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

diff --git a/indra/newview/lltoolcomp.h b/indra/newview/lltoolcomp.h
index 7507984d08..0ea8afde28 100644
--- a/indra/newview/lltoolcomp.h
+++ b/indra/newview/lltoolcomp.h
@@ -1,245 +1,245 @@
-/** 
- * @file lltoolcomp.h
- * @brief Composite tools
- *
- * $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$
- */
-
-#ifndef LL_TOOLCOMP_H
-#define LL_TOOLCOMP_H
-
-#include "lltool.h"
-
-class LLManip;
-class LLToolSelectRect;
-class LLToolPlacer;
-class LLPickInfo;
-
-class LLView;
-class LLTextBox;
-
-//-----------------------------------------------------------------------
-// LLToolComposite
-
-class LLToolComposite : public LLTool
-{
-public:
-	LLToolComposite(const std::string& name);
-
-    virtual bool			handleMouseDown(S32 x, S32 y, MASK mask) = 0;	// Sets the current tool
-    virtual bool			handleMouseUp(S32 x, S32 y, MASK mask);			// Returns to the default tool
-	virtual bool			handleDoubleClick(S32 x, S32 y, MASK mask) = 0;
-
-	// Map virtual functions to the currently active internal tool
-    virtual bool			handleHover(S32 x, S32 y, MASK mask)			{ return mCur->handleHover( x, y, mask ); }
-	virtual bool			handleScrollWheel(S32 x, S32 y, S32 clicks)		{ return mCur->handleScrollWheel( x, y, clicks ); }
-	virtual bool			handleRightMouseDown(S32 x, S32 y, MASK mask)	{ return mCur->handleRightMouseDown( x, y, mask ); }
-
-	virtual LLViewerObject*	getEditingObject()								{ return mCur->getEditingObject(); }
-	virtual LLVector3d		getEditingPointGlobal()							{ return mCur->getEditingPointGlobal(); }
-	virtual bool			isEditing()										{ return mCur->isEditing(); }
-	virtual void			stopEditing()									{ mCur->stopEditing(); mCur = mDefault; }
-
-	virtual bool			clipMouseWhenDown()								{ return mCur->clipMouseWhenDown(); }
-
-	virtual void			handleSelect();
-	virtual void			handleDeselect();
-
-	virtual void			render()										{ mCur->render(); }
-	virtual void			draw()											{ mCur->draw(); }
-
-	virtual bool			handleKey(KEY key, MASK mask)					{ return mCur->handleKey( key, mask ); }
-
-	virtual void			onMouseCaptureLost();
-
-	virtual void			screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const
-								{ mCur->screenPointToLocal(screen_x, screen_y, local_x, local_y); }
-
-	virtual void			localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const
-								{ mCur->localPointToScreen(local_x, local_y, screen_x, screen_y); }
-
-	bool					isSelecting();
-	LLTool*					getCurrentTool()								{ return mCur; }
-
-protected:
-	void					setCurrentTool( LLTool* new_tool );
-	// In hover handler, call this to auto-switch tools
-	void					setToolFromMask( MASK mask, LLTool *normal );
-
-protected:
-	LLTool*					mCur;		// The tool to which we're delegating.
-	LLTool*					mDefault;
-	bool					mSelected;
-	bool					mMouseDown;
-	LLManip*				mManip;
-	LLToolSelectRect*		mSelectRect;
-
-public:
-	static const std::string sNameComp;
-};
-
-
-//-----------------------------------------------------------------------
-// LLToolCompTranslate
-
-class LLToolCompInspect : public LLToolComposite, public LLSingleton<LLToolCompInspect>
-{
-	LLSINGLETON(LLToolCompInspect);
-	virtual ~LLToolCompInspect();
-public:
-
-	// Overridden from LLToolComposite
-    virtual bool		handleMouseDown(S32 x, S32 y, MASK mask) override;
-	virtual bool		handleMouseUp(S32 x, S32 y, MASK mask) override;
-    virtual bool		handleDoubleClick(S32 x, S32 y, MASK mask) override;
-	virtual bool		handleKey(KEY key, MASK mask) override;
-	virtual void		onMouseCaptureLost() override;
-			void		keyUp(KEY key, MASK mask);
-
-	static void pickCallback(const LLPickInfo& pick_info);
-
-	bool isToolCameraActive() const { return mIsToolCameraActive; }
-
-private:
-	bool mIsToolCameraActive;
-};
-
-//-----------------------------------------------------------------------
-// LLToolCompTranslate
-
-class LLToolCompTranslate : public LLToolComposite, public LLSingleton<LLToolCompTranslate>
-{
-	LLSINGLETON(LLToolCompTranslate);
-	virtual ~LLToolCompTranslate();
-public:
-
-	// Overridden from LLToolComposite
-	virtual bool		handleMouseDown(S32 x, S32 y, MASK mask) override;
-	virtual bool		handleDoubleClick(S32 x, S32 y, MASK mask) override;
-	virtual bool		handleHover(S32 x, S32 y, MASK mask) override;
-	virtual bool		handleMouseUp(S32 x, S32 y, MASK mask) override;			// Returns to the default tool
-	virtual void		render() override;
-
-	virtual LLTool*		getOverrideTool(MASK mask) override;
-
-	static void pickCallback(const LLPickInfo& pick_info);
-};
-
-//-----------------------------------------------------------------------
-// LLToolCompScale
-
-class LLToolCompScale : public LLToolComposite, public LLSingleton<LLToolCompScale>
-{
-	LLSINGLETON(LLToolCompScale);
-	virtual ~LLToolCompScale();
-public:
-
-	// Overridden from LLToolComposite
-    virtual bool		handleMouseDown(S32 x, S32 y, MASK mask) override;
-    virtual bool		handleDoubleClick(S32 x, S32 y, MASK mask) override;
-    virtual bool		handleHover(S32 x, S32 y, MASK mask) override;
-	virtual bool		handleMouseUp(S32 x, S32 y, MASK mask) override;			// Returns to the default tool
-	virtual void		render() override;
-
-	virtual LLTool*		getOverrideTool(MASK mask) override;
-	
-	static void pickCallback(const LLPickInfo& pick_info);
-};
-
-
-//-----------------------------------------------------------------------
-// LLToolCompRotate
-
-class LLToolCompRotate : public LLToolComposite, public LLSingleton<LLToolCompRotate>
-{
-	LLSINGLETON(LLToolCompRotate);
-	virtual ~LLToolCompRotate();
-public:
-
-	// Overridden from LLToolComposite
-    virtual bool		handleMouseDown(S32 x, S32 y, MASK mask) override;
-    virtual bool		handleDoubleClick(S32 x, S32 y, MASK mask) override;
-    virtual bool		handleHover(S32 x, S32 y, MASK mask) override;
-	virtual bool		handleMouseUp(S32 x, S32 y, MASK mask) override;
-	virtual void		render() override;
-
-	virtual LLTool*		getOverrideTool(MASK mask) override;
-
-	static void pickCallback(const LLPickInfo& pick_info);
-
-protected:
-};
-
-//-----------------------------------------------------------------------
-// LLToolCompCreate
-
-class LLToolCompCreate : public LLToolComposite, public LLSingleton<LLToolCompCreate>
-{
-	LLSINGLETON(LLToolCompCreate);
-	virtual ~LLToolCompCreate();
-public:
-
-	// Overridden from LLToolComposite
-    virtual bool		handleMouseDown(S32 x, S32 y, MASK mask) override;
-    virtual bool		handleDoubleClick(S32 x, S32 y, MASK mask) override;
-	virtual bool		handleMouseUp(S32 x, S32 y, MASK mask) override;
-	
-	static void pickCallback(const LLPickInfo& pick_info);
-protected:
-	LLToolPlacer*		mPlacer;
-	bool				mObjectPlacedOnMouseDown;
-};
-
-
-//-----------------------------------------------------------------------
-// LLToolCompGun
-
-class LLToolGun;
-class LLToolGrabBase;
-class LLToolSelect;
-
-class LLToolCompGun : public LLToolComposite, public LLSingleton<LLToolCompGun>
-{
-	LLSINGLETON(LLToolCompGun);
-	virtual ~LLToolCompGun();
-public:
-
-	// Overridden from LLToolComposite
-    virtual bool			handleHover(S32 x, S32 y, MASK mask) override;
-	virtual bool			handleMouseDown(S32 x, S32 y, MASK mask) override;
-	virtual bool			handleDoubleClick(S32 x, S32 y, MASK mask) override;
-	virtual bool			handleRightMouseDown(S32 x, S32 y, MASK mask) override;
-	virtual bool			handleMouseUp(S32 x, S32 y, MASK mask) override;
-	virtual bool			handleScrollWheel(S32 x, S32 y, S32 clicks) override;
-	virtual void			onMouseCaptureLost() override;
-	virtual void			handleSelect() override;
-	virtual void			handleDeselect() override;
-	virtual LLTool*			getOverrideTool(MASK mask) override { return NULL; }
-
-protected:
-	LLToolGun*			mGun;
-	LLToolGrabBase*		mGrab;
-	LLTool*				mNull;
-};
-
-
-#endif  // LL_TOOLCOMP_H
+/**

+ * @file lltoolcomp.h

+ * @brief Composite tools

+ *

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

+ */

+

+#ifndef LL_TOOLCOMP_H

+#define LL_TOOLCOMP_H

+

+#include "lltool.h"

+

+class LLManip;

+class LLToolSelectRect;

+class LLToolPlacer;

+class LLPickInfo;

+

+class LLView;

+class LLTextBox;

+

+//-----------------------------------------------------------------------

+// LLToolComposite

+

+class LLToolComposite : public LLTool

+{

+public:

+    LLToolComposite(const std::string& name);

+

+    virtual bool            handleMouseDown(S32 x, S32 y, MASK mask) = 0;   // Sets the current tool

+    virtual bool            handleMouseUp(S32 x, S32 y, MASK mask);         // Returns to the default tool

+    virtual bool            handleDoubleClick(S32 x, S32 y, MASK mask) = 0;

+

+    // Map virtual functions to the currently active internal tool

+    virtual bool            handleHover(S32 x, S32 y, MASK mask)            { return mCur->handleHover( x, y, mask ); }

+    virtual bool            handleScrollWheel(S32 x, S32 y, S32 clicks)     { return mCur->handleScrollWheel( x, y, clicks ); }

+    virtual bool            handleRightMouseDown(S32 x, S32 y, MASK mask)   { return mCur->handleRightMouseDown( x, y, mask ); }

+

+    virtual LLViewerObject* getEditingObject()                              { return mCur->getEditingObject(); }

+    virtual LLVector3d      getEditingPointGlobal()                         { return mCur->getEditingPointGlobal(); }

+    virtual bool            isEditing()                                     { return mCur->isEditing(); }

+    virtual void            stopEditing()                                   { mCur->stopEditing(); mCur = mDefault; }

+

+    virtual bool            clipMouseWhenDown()                             { return mCur->clipMouseWhenDown(); }

+

+    virtual void            handleSelect();

+    virtual void            handleDeselect();

+

+    virtual void            render()                                        { mCur->render(); }

+    virtual void            draw()                                          { mCur->draw(); }

+

+    virtual bool            handleKey(KEY key, MASK mask)                   { return mCur->handleKey( key, mask ); }

+

+    virtual void            onMouseCaptureLost();

+

+    virtual void            screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const

+                                { mCur->screenPointToLocal(screen_x, screen_y, local_x, local_y); }

+

+    virtual void            localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const

+                                { mCur->localPointToScreen(local_x, local_y, screen_x, screen_y); }

+

+    bool                    isSelecting();

+    LLTool*                 getCurrentTool()                                { return mCur; }

+

+protected:

+    void                    setCurrentTool( LLTool* new_tool );

+    // In hover handler, call this to auto-switch tools

+    void                    setToolFromMask( MASK mask, LLTool *normal );

+

+protected:

+    LLTool*                 mCur;       // The tool to which we're delegating.

+    LLTool*                 mDefault;

+    bool                    mSelected;

+    bool                    mMouseDown;

+    LLManip*                mManip;

+    LLToolSelectRect*       mSelectRect;

+

+public:

+    static const std::string sNameComp;

+};

+

+

+//-----------------------------------------------------------------------

+// LLToolCompTranslate

+

+class LLToolCompInspect : public LLToolComposite, public LLSingleton<LLToolCompInspect>

+{

+    LLSINGLETON(LLToolCompInspect);

+    virtual ~LLToolCompInspect();

+public:

+

+    // Overridden from LLToolComposite

+    virtual bool        handleMouseDown(S32 x, S32 y, MASK mask) override;

+    virtual bool        handleMouseUp(S32 x, S32 y, MASK mask) override;

+    virtual bool        handleDoubleClick(S32 x, S32 y, MASK mask) override;

+    virtual bool        handleKey(KEY key, MASK mask) override;

+    virtual void        onMouseCaptureLost() override;

+            void        keyUp(KEY key, MASK mask);

+

+    static void pickCallback(const LLPickInfo& pick_info);

+

+    bool isToolCameraActive() const { return mIsToolCameraActive; }

+

+private:

+    bool mIsToolCameraActive;

+};

+

+//-----------------------------------------------------------------------

+// LLToolCompTranslate

+

+class LLToolCompTranslate : public LLToolComposite, public LLSingleton<LLToolCompTranslate>

+{

+    LLSINGLETON(LLToolCompTranslate);

+    virtual ~LLToolCompTranslate();

+public:

+

+    // Overridden from LLToolComposite

+    virtual bool        handleMouseDown(S32 x, S32 y, MASK mask) override;

+    virtual bool        handleDoubleClick(S32 x, S32 y, MASK mask) override;

+    virtual bool        handleHover(S32 x, S32 y, MASK mask) override;

+    virtual bool        handleMouseUp(S32 x, S32 y, MASK mask) override;            // Returns to the default tool

+    virtual void        render() override;

+

+    virtual LLTool*     getOverrideTool(MASK mask) override;

+

+    static void pickCallback(const LLPickInfo& pick_info);

+};

+

+//-----------------------------------------------------------------------

+// LLToolCompScale

+

+class LLToolCompScale : public LLToolComposite, public LLSingleton<LLToolCompScale>

+{

+    LLSINGLETON(LLToolCompScale);

+    virtual ~LLToolCompScale();

+public:

+

+    // Overridden from LLToolComposite

+    virtual bool        handleMouseDown(S32 x, S32 y, MASK mask) override;

+    virtual bool        handleDoubleClick(S32 x, S32 y, MASK mask) override;

+    virtual bool        handleHover(S32 x, S32 y, MASK mask) override;

+    virtual bool        handleMouseUp(S32 x, S32 y, MASK mask) override;            // Returns to the default tool

+    virtual void        render() override;

+

+    virtual LLTool*     getOverrideTool(MASK mask) override;

+

+    static void pickCallback(const LLPickInfo& pick_info);

+};

+

+

+//-----------------------------------------------------------------------

+// LLToolCompRotate

+

+class LLToolCompRotate : public LLToolComposite, public LLSingleton<LLToolCompRotate>

+{

+    LLSINGLETON(LLToolCompRotate);

+    virtual ~LLToolCompRotate();

+public:

+

+    // Overridden from LLToolComposite

+    virtual bool        handleMouseDown(S32 x, S32 y, MASK mask) override;

+    virtual bool        handleDoubleClick(S32 x, S32 y, MASK mask) override;

+    virtual bool        handleHover(S32 x, S32 y, MASK mask) override;

+    virtual bool        handleMouseUp(S32 x, S32 y, MASK mask) override;

+    virtual void        render() override;

+

+    virtual LLTool*     getOverrideTool(MASK mask) override;

+

+    static void pickCallback(const LLPickInfo& pick_info);

+

+protected:

+};

+

+//-----------------------------------------------------------------------

+// LLToolCompCreate

+

+class LLToolCompCreate : public LLToolComposite, public LLSingleton<LLToolCompCreate>

+{

+    LLSINGLETON(LLToolCompCreate);

+    virtual ~LLToolCompCreate();

+public:

+

+    // Overridden from LLToolComposite

+    virtual bool        handleMouseDown(S32 x, S32 y, MASK mask) override;

+    virtual bool        handleDoubleClick(S32 x, S32 y, MASK mask) override;

+    virtual bool        handleMouseUp(S32 x, S32 y, MASK mask) override;

+

+    static void pickCallback(const LLPickInfo& pick_info);

+protected:

+    LLToolPlacer*       mPlacer;

+    bool                mObjectPlacedOnMouseDown;

+};

+

+

+//-----------------------------------------------------------------------

+// LLToolCompGun

+

+class LLToolGun;

+class LLToolGrabBase;

+class LLToolSelect;

+

+class LLToolCompGun : public LLToolComposite, public LLSingleton<LLToolCompGun>

+{

+    LLSINGLETON(LLToolCompGun);

+    virtual ~LLToolCompGun();

+public:

+

+    // Overridden from LLToolComposite

+    virtual bool            handleHover(S32 x, S32 y, MASK mask) override;

+    virtual bool            handleMouseDown(S32 x, S32 y, MASK mask) override;

+    virtual bool            handleDoubleClick(S32 x, S32 y, MASK mask) override;

+    virtual bool            handleRightMouseDown(S32 x, S32 y, MASK mask) override;

+    virtual bool            handleMouseUp(S32 x, S32 y, MASK mask) override;

+    virtual bool            handleScrollWheel(S32 x, S32 y, S32 clicks) override;

+    virtual void            onMouseCaptureLost() override;

+    virtual void            handleSelect() override;

+    virtual void            handleDeselect() override;

+    virtual LLTool*         getOverrideTool(MASK mask) override { return NULL; }

+

+protected:

+    LLToolGun*          mGun;

+    LLToolGrabBase*     mGrab;

+    LLTool*             mNull;

+};

+

+

+#endif  // LL_TOOLCOMP_H