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

diff --git a/indra/newview/lltoolselectland.h b/indra/newview/lltoolselectland.h
index 893bf970d1..e6184672ff 100644
--- a/indra/newview/lltoolselectland.h
+++ b/indra/newview/lltoolselectland.h
@@ -1,76 +1,76 @@
-/** 
- * @file lltoolselectland.h
- * @brief LLToolSelectLand class header file
- *
- * $LicenseInfo:firstyear=2002&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_LLTOOLSELECTLAND_H
-#define LL_LLTOOLSELECTLAND_H
-
-#include "lltool.h"
-#include "v3dmath.h"
-
-class LLParcelSelection;
-
-class LLToolSelectLand
-:	public LLTool, public LLSingleton<LLToolSelectLand>
-{
-	LLSINGLETON(LLToolSelectLand);
-	virtual ~LLToolSelectLand();
-
-public:
-	/*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;
-	/*virtual*/ bool		handleHover(S32 x, S32 y, MASK mask) override;
-	/*virtual*/ void		render() override;				// draw the select rectangle
-	/*virtual*/ bool		isAlwaysRendered() override	{ return true; }
-
-	/*virtual*/ void		handleSelect() override;
-	/*virtual*/ void		handleDeselect() override;
-
-protected:
-	bool			outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y);
-	void			roundXY(LLVector3d& vec);
-
-protected:
-	LLVector3d		mDragStartGlobal;		// global coords
-	LLVector3d		mDragEndGlobal;			// global coords
-	bool			mDragEndValid;			// is drag end a valid point in the world?
-
-	S32				mDragStartX;			// screen coords, from left
-	S32				mDragStartY;			// screen coords, from bottom
-
-	S32				mDragEndX;
-	S32				mDragEndY;
-
-	bool			mMouseOutsideSlop;		// has mouse ever gone outside slop region?
-
-	LLVector3d		mWestSouthBottom;		// global coords, from drag
-	LLVector3d		mEastNorthTop;			// global coords, from drag
-
-	LLSafeHandle<LLParcelSelection> mSelection;		// hold on to a parcel selection
-};
-
-
-#endif
+/**

+ * @file lltoolselectland.h

+ * @brief LLToolSelectLand class header file

+ *

+ * $LicenseInfo:firstyear=2002&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_LLTOOLSELECTLAND_H

+#define LL_LLTOOLSELECTLAND_H

+

+#include "lltool.h"

+#include "v3dmath.h"

+

+class LLParcelSelection;

+

+class LLToolSelectLand

+:   public LLTool, public LLSingleton<LLToolSelectLand>

+{

+    LLSINGLETON(LLToolSelectLand);

+    virtual ~LLToolSelectLand();

+

+public:

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

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

+    /*virtual*/ void        render() override;              // draw the select rectangle

+    /*virtual*/ bool        isAlwaysRendered() override { return true; }

+

+    /*virtual*/ void        handleSelect() override;

+    /*virtual*/ void        handleDeselect() override;

+

+protected:

+    bool            outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y);

+    void            roundXY(LLVector3d& vec);

+

+protected:

+    LLVector3d      mDragStartGlobal;       // global coords

+    LLVector3d      mDragEndGlobal;         // global coords

+    bool            mDragEndValid;          // is drag end a valid point in the world?

+

+    S32             mDragStartX;            // screen coords, from left

+    S32             mDragStartY;            // screen coords, from bottom

+

+    S32             mDragEndX;

+    S32             mDragEndY;

+

+    bool            mMouseOutsideSlop;      // has mouse ever gone outside slop region?

+

+    LLVector3d      mWestSouthBottom;       // global coords, from drag

+    LLVector3d      mEastNorthTop;          // global coords, from drag

+

+    LLSafeHandle<LLParcelSelection> mSelection;     // hold on to a parcel selection

+};

+

+

+#endif