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

diff --git a/indra/newview/lltoolselectrect.cpp b/indra/newview/lltoolselectrect.cpp
index feba24c2b3..4e5d853c85 100644
--- a/indra/newview/lltoolselectrect.cpp
+++ b/indra/newview/lltoolselectrect.cpp
@@ -1,207 +1,207 @@
-/** 
- * @file lltoolselectrect.cpp
- * @brief A tool to select multiple objects with a screen-space rectangle.
- *
- * $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$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-// File includes
-#include "lltoolselectrect.h"
-
-// Library includes
-#include "llgl.h"
-#include "llrender.h"
-
-// Viewer includes
-#include "llviewercontrol.h"
-#include "llui.h"
-#include "llselectmgr.h"
-#include "lltoolmgr.h"
-#include "llviewerobject.h"
-#include "llviewerobjectlist.h"
-#include "llviewerwindow.h"
-#include "llviewercamera.h"
-
-#include "llglheaders.h"
-
-// Globals
-const S32 SLOP_RADIUS = 5;
-
-
-//
-// Member functions
-//
-
-LLToolSelectRect::LLToolSelectRect( LLToolComposite* composite )
-	:
-	LLToolSelect( composite ),
-	mDragStartX(0),
-	mDragStartY(0),
-	mDragEndX(0),
-	mDragEndY(0),
-	mDragLastWidth(0),
-	mDragLastHeight(0),
-	mMouseOutsideSlop(false)
-
-{ }
-
-
-void dialog_refresh_all(void);
-
-bool LLToolSelectRect::handleMouseDown(S32 x, S32 y, MASK mask)
-{
-    bool pick_rigged = false; //gSavedSettings.getBOOL("AnimatedObjectsAllowLeftClick");
-	handlePick(gViewerWindow->pickImmediate(x, y, true /* pick_transparent */, pick_rigged));
-
-	LLTool::handleMouseDown(x, y, mask);
-
-	return mPick.getObject().notNull();
-}
-
-void LLToolSelectRect::handlePick(const LLPickInfo& pick)
-{
-	mPick = pick;
-
-	// start dragging rectangle
-	setMouseCapture( true );
-
-	mDragStartX = pick.mMousePt.mX;
-	mDragStartY = pick.mMousePt.mY;
-	mDragEndX = pick.mMousePt.mX;
-	mDragEndY = pick.mMousePt.mY;
-
-	mMouseOutsideSlop = false;
-}
-
-
-bool LLToolSelectRect::handleMouseUp(S32 x, S32 y, MASK mask)
-{
-	setMouseCapture( false );
-
-	if(	mMouseOutsideSlop )
-	{
-		mDragLastWidth = 0;
-		mDragLastHeight = 0;
-
-		mMouseOutsideSlop = false;
-		
-		if (mask == MASK_CONTROL)
-		{
-			LLSelectMgr::getInstance()->deselectHighlightedObjects();
-		}
-		else
-		{
-			LLSelectMgr::getInstance()->selectHighlightedObjects();
-		}
-		return true;
-	}
-	else
-	{
-		return LLToolSelect::handleMouseUp(x, y, mask);
-	}
-}
-
-
-bool LLToolSelectRect::handleHover(S32 x, S32 y, MASK mask)
-{
-	if(	hasMouseCapture() )
-	{
-		if (mMouseOutsideSlop || outsideSlop(x, y, mDragStartX, mDragStartY))
-		{
-			if (!mMouseOutsideSlop && !(mask & MASK_SHIFT) && !(mask & MASK_CONTROL))
-			{
-				// just started rect select, and not adding to current selection
-				LLSelectMgr::getInstance()->deselectAll();
-			}
-			mMouseOutsideSlop = true;
-			mDragEndX = x;
-			mDragEndY = y;
-
-			handleRectangleSelection(x, y, mask);
-		}
-		else
-		{
-			return LLToolSelect::handleHover(x, y, mask);
-		}
-
-		LL_DEBUGS("UserInput") << "hover handled by LLToolSelectRect (active)" << LL_ENDL;		
-	}
-	else
-	{
-		LL_DEBUGS("UserInput") << "hover handled by LLToolSelectRect (inactive)" << LL_ENDL;		
-	}
-
-	gViewerWindow->setCursor(UI_CURSOR_ARROW);
-	return true;
-}
-
-
-void LLToolSelectRect::draw()
-{
-	if(	hasMouseCapture() && mMouseOutsideSlop)
-	{
-		if (gKeyboard->currentMask(true) == MASK_CONTROL)
-		{
-			gGL.color4f(1.f, 0.f, 0.f, 1.f);
-		}
-		else
-		{
-			gGL.color4f(1.f, 1.f, 0.f, 1.f);
-		}
-		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-		gl_rect_2d(
-			llmin(mDragStartX, mDragEndX),
-			llmax(mDragStartY, mDragEndY),
-			llmax(mDragStartX, mDragEndX),
-			llmin(mDragStartY, mDragEndY),
-			false);
-		if (gKeyboard->currentMask(true) == MASK_CONTROL)
-		{
-			gGL.color4f(1.f, 0.f, 0.f, 0.1f);
-		}
-		else
-		{
-			gGL.color4f(1.f, 1.f, 0.f, 0.1f);
-		}
-		gl_rect_2d(
-			llmin(mDragStartX, mDragEndX),
-			llmax(mDragStartY, mDragEndY),
-			llmax(mDragStartX, mDragEndX),
-			llmin(mDragStartY, mDragEndY));
-	}
-}
-
-// true if x,y outside small box around start_x,start_y
-bool LLToolSelectRect::outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y)
-{
-	S32 dx = x - start_x;
-	S32 dy = y - start_y;
-
-	return (dx <= -SLOP_RADIUS || SLOP_RADIUS <= dx || dy <= -SLOP_RADIUS || SLOP_RADIUS <= dy);
-}
-
-
-//
-// Static functions
-//
+/**

+ * @file lltoolselectrect.cpp

+ * @brief A tool to select multiple objects with a screen-space rectangle.

+ *

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

+ */

+

+#include "llviewerprecompiledheaders.h"

+

+// File includes

+#include "lltoolselectrect.h"

+

+// Library includes

+#include "llgl.h"

+#include "llrender.h"

+

+// Viewer includes

+#include "llviewercontrol.h"

+#include "llui.h"

+#include "llselectmgr.h"

+#include "lltoolmgr.h"

+#include "llviewerobject.h"

+#include "llviewerobjectlist.h"

+#include "llviewerwindow.h"

+#include "llviewercamera.h"

+

+#include "llglheaders.h"

+

+// Globals

+const S32 SLOP_RADIUS = 5;

+

+

+//

+// Member functions

+//

+

+LLToolSelectRect::LLToolSelectRect( LLToolComposite* composite )

+    :

+    LLToolSelect( composite ),

+    mDragStartX(0),

+    mDragStartY(0),

+    mDragEndX(0),

+    mDragEndY(0),

+    mDragLastWidth(0),

+    mDragLastHeight(0),

+    mMouseOutsideSlop(false)

+

+{ }

+

+

+void dialog_refresh_all(void);

+

+bool LLToolSelectRect::handleMouseDown(S32 x, S32 y, MASK mask)

+{

+    bool pick_rigged = false; //gSavedSettings.getBOOL("AnimatedObjectsAllowLeftClick");

+    handlePick(gViewerWindow->pickImmediate(x, y, true /* pick_transparent */, pick_rigged));

+

+    LLTool::handleMouseDown(x, y, mask);

+

+    return mPick.getObject().notNull();

+}

+

+void LLToolSelectRect::handlePick(const LLPickInfo& pick)

+{

+    mPick = pick;

+

+    // start dragging rectangle

+    setMouseCapture( true );

+

+    mDragStartX = pick.mMousePt.mX;

+    mDragStartY = pick.mMousePt.mY;

+    mDragEndX = pick.mMousePt.mX;

+    mDragEndY = pick.mMousePt.mY;

+

+    mMouseOutsideSlop = false;

+}

+

+

+bool LLToolSelectRect::handleMouseUp(S32 x, S32 y, MASK mask)

+{

+    setMouseCapture( false );

+

+    if( mMouseOutsideSlop )

+    {

+        mDragLastWidth = 0;

+        mDragLastHeight = 0;

+

+        mMouseOutsideSlop = false;

+

+        if (mask == MASK_CONTROL)

+        {

+            LLSelectMgr::getInstance()->deselectHighlightedObjects();

+        }

+        else

+        {

+            LLSelectMgr::getInstance()->selectHighlightedObjects();

+        }

+        return true;

+    }

+    else

+    {

+        return LLToolSelect::handleMouseUp(x, y, mask);

+    }

+}

+

+

+bool LLToolSelectRect::handleHover(S32 x, S32 y, MASK mask)

+{

+    if( hasMouseCapture() )

+    {

+        if (mMouseOutsideSlop || outsideSlop(x, y, mDragStartX, mDragStartY))

+        {

+            if (!mMouseOutsideSlop && !(mask & MASK_SHIFT) && !(mask & MASK_CONTROL))

+            {

+                // just started rect select, and not adding to current selection

+                LLSelectMgr::getInstance()->deselectAll();

+            }

+            mMouseOutsideSlop = true;

+            mDragEndX = x;

+            mDragEndY = y;

+

+            handleRectangleSelection(x, y, mask);

+        }

+        else

+        {

+            return LLToolSelect::handleHover(x, y, mask);

+        }

+

+        LL_DEBUGS("UserInput") << "hover handled by LLToolSelectRect (active)" << LL_ENDL;

+    }

+    else

+    {

+        LL_DEBUGS("UserInput") << "hover handled by LLToolSelectRect (inactive)" << LL_ENDL;

+    }

+

+    gViewerWindow->setCursor(UI_CURSOR_ARROW);

+    return true;

+}

+

+

+void LLToolSelectRect::draw()

+{

+    if( hasMouseCapture() && mMouseOutsideSlop)

+    {

+        if (gKeyboard->currentMask(true) == MASK_CONTROL)

+        {

+            gGL.color4f(1.f, 0.f, 0.f, 1.f);

+        }

+        else

+        {

+            gGL.color4f(1.f, 1.f, 0.f, 1.f);

+        }

+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);

+        gl_rect_2d(

+            llmin(mDragStartX, mDragEndX),

+            llmax(mDragStartY, mDragEndY),

+            llmax(mDragStartX, mDragEndX),

+            llmin(mDragStartY, mDragEndY),

+            false);

+        if (gKeyboard->currentMask(true) == MASK_CONTROL)

+        {

+            gGL.color4f(1.f, 0.f, 0.f, 0.1f);

+        }

+        else

+        {

+            gGL.color4f(1.f, 1.f, 0.f, 0.1f);

+        }

+        gl_rect_2d(

+            llmin(mDragStartX, mDragEndX),

+            llmax(mDragStartY, mDragEndY),

+            llmax(mDragStartX, mDragEndX),

+            llmin(mDragStartY, mDragEndY));

+    }

+}

+

+// true if x,y outside small box around start_x,start_y

+bool LLToolSelectRect::outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y)

+{

+    S32 dx = x - start_x;

+    S32 dy = y - start_y;

+

+    return (dx <= -SLOP_RADIUS || SLOP_RADIUS <= dx || dy <= -SLOP_RADIUS || SLOP_RADIUS <= dy);

+}

+

+

+//

+// Static functions

+//