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

diff --git a/indra/newview/lltoolgun.cpp b/indra/newview/lltoolgun.cpp
index 0dc6356a59..4613f454ef 100644
--- a/indra/newview/lltoolgun.cpp
+++ b/indra/newview/lltoolgun.cpp
@@ -1,148 +1,148 @@
-/** 
- * @file lltoolgun.cpp
- * @brief LLToolGun class implementation
- *
- * $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"
-
-#include "lltoolgun.h"
-
-#include "llviewerwindow.h"
-#include "llagent.h"
-#include "llagentcamera.h"
-#include "llviewercontrol.h"
-#include "llsky.h"
-#include "llappviewer.h"
-#include "llresmgr.h"
-#include "llfontgl.h"
-#include "llui.h"
-#include "llviewertexturelist.h"
-#include "llviewercamera.h"
-#include "llhudmanager.h"
-#include "lltoolmgr.h"
-#include "lltoolgrab.h"
-#include "lluiimage.h"
-// Linden library includes
-#include "llwindow.h"			// setMouseClipping()
-
-LLToolGun::LLToolGun( LLToolComposite* composite )
-:	LLTool( std::string("gun"), composite ),
-		mIsSelected(false)
-{
-}
-
-void LLToolGun::handleSelect()
-{
-	gViewerWindow->hideCursor();
-	gViewerWindow->moveCursorToCenter();
-	gViewerWindow->getWindow()->setMouseClipping(true);
-	mIsSelected = true;
-}
-
-void LLToolGun::handleDeselect()
-{
-	gViewerWindow->moveCursorToCenter();
-	gViewerWindow->showCursor();
-	gViewerWindow->getWindow()->setMouseClipping(false);
-	mIsSelected = false;
-}
-
-bool LLToolGun::handleMouseDown(S32 x, S32 y, MASK mask)
-{
-	gGrabTransientTool = this;
-	LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolGrab::getInstance() );
-
-	return LLToolGrab::getInstance()->handleMouseDown(x, y, mask);
-}
-
-bool LLToolGun::handleHover(S32 x, S32 y, MASK mask)
-{
-	if( gAgentCamera.cameraMouselook() && mIsSelected )
-	{
-		const F32 NOMINAL_MOUSE_SENSITIVITY = 0.0025f;
-
-		F32 mouse_sensitivity = gSavedSettings.getF32("MouseSensitivity");
-		mouse_sensitivity = clamp_rescale(mouse_sensitivity, 0.f, 15.f, 0.5f, 2.75f) * NOMINAL_MOUSE_SENSITIVITY;
-
-		// ...move the view with the mouse
-
-		// get mouse movement delta
-		S32 dx = -gViewerWindow->getCurrentMouseDX();
-		S32 dy = -gViewerWindow->getCurrentMouseDY();
-		
-		if (dx != 0 || dy != 0)
-		{
-			// ...actually moved off center
-			if (gSavedSettings.getBOOL("InvertMouse"))
-			{
-				gAgent.pitch(mouse_sensitivity * -dy);
-			}
-			else
-			{
-				gAgent.pitch(mouse_sensitivity * dy);
-			}
-			LLVector3 skyward = gAgent.getReferenceUpVector();
-			gAgent.rotate(mouse_sensitivity * dx, skyward.mV[VX], skyward.mV[VY], skyward.mV[VZ]);
-
-			if (gSavedSettings.getBOOL("MouseSun"))
-			{
-                LLVector3 sunpos = LLViewerCamera::getInstance()->getAtAxis();
-				gSky.setSunDirectionCFR(sunpos);
-				gSavedSettings.setVector3("SkySunDefaultPosition", LLViewerCamera::getInstance()->getAtAxis());
-			}
-
-            if (gSavedSettings.getBOOL("MouseMoon"))
-			{
-                LLVector3 moonpos = LLViewerCamera::getInstance()->getAtAxis();
-				gSky.setMoonDirectionCFR(moonpos);
-				gSavedSettings.setVector3("SkyMoonDefaultPosition", LLViewerCamera::getInstance()->getAtAxis());
-			}
-
-			gViewerWindow->moveCursorToCenter();
-			gViewerWindow->hideCursor();
-		}
-
-		LL_DEBUGS("UserInput") << "hover handled by LLToolGun (mouselook)" << LL_ENDL;
-	}
-	else
-	{
-		LL_DEBUGS("UserInput") << "hover handled by LLToolGun (not mouselook)" << LL_ENDL;
-	}
-
-	// HACK to avoid assert: error checking system makes sure that the cursor is set during every handleHover.  This is actually a no-op since the cursor is hidden.
-	gViewerWindow->setCursor(UI_CURSOR_ARROW);  
-
-	return true;
-}
-
-void LLToolGun::draw()
-{
-	if( gSavedSettings.getBOOL("ShowCrosshairs") )
-	{
-		LLUIImagePtr crosshair = LLUI::getUIImage("crosshairs.tga");
-		crosshair->draw(
-			( gViewerWindow->getWorldViewRectScaled().getWidth() - crosshair->getWidth() ) / 2,
-			( gViewerWindow->getWorldViewRectScaled().getHeight() - crosshair->getHeight() ) / 2);
-	}
-}
+/**

+ * @file lltoolgun.cpp

+ * @brief LLToolGun class implementation

+ *

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

+

+#include "lltoolgun.h"

+

+#include "llviewerwindow.h"

+#include "llagent.h"

+#include "llagentcamera.h"

+#include "llviewercontrol.h"

+#include "llsky.h"

+#include "llappviewer.h"

+#include "llresmgr.h"

+#include "llfontgl.h"

+#include "llui.h"

+#include "llviewertexturelist.h"

+#include "llviewercamera.h"

+#include "llhudmanager.h"

+#include "lltoolmgr.h"

+#include "lltoolgrab.h"

+#include "lluiimage.h"

+// Linden library includes

+#include "llwindow.h"           // setMouseClipping()

+

+LLToolGun::LLToolGun( LLToolComposite* composite )

+:   LLTool( std::string("gun"), composite ),

+        mIsSelected(false)

+{

+}

+

+void LLToolGun::handleSelect()

+{

+    gViewerWindow->hideCursor();

+    gViewerWindow->moveCursorToCenter();

+    gViewerWindow->getWindow()->setMouseClipping(true);

+    mIsSelected = true;

+}

+

+void LLToolGun::handleDeselect()

+{

+    gViewerWindow->moveCursorToCenter();

+    gViewerWindow->showCursor();

+    gViewerWindow->getWindow()->setMouseClipping(false);

+    mIsSelected = false;

+}

+

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

+{

+    gGrabTransientTool = this;

+    LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolGrab::getInstance() );

+

+    return LLToolGrab::getInstance()->handleMouseDown(x, y, mask);

+}

+

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

+{

+    if( gAgentCamera.cameraMouselook() && mIsSelected )

+    {

+        const F32 NOMINAL_MOUSE_SENSITIVITY = 0.0025f;

+

+        F32 mouse_sensitivity = gSavedSettings.getF32("MouseSensitivity");

+        mouse_sensitivity = clamp_rescale(mouse_sensitivity, 0.f, 15.f, 0.5f, 2.75f) * NOMINAL_MOUSE_SENSITIVITY;

+

+        // ...move the view with the mouse

+

+        // get mouse movement delta

+        S32 dx = -gViewerWindow->getCurrentMouseDX();

+        S32 dy = -gViewerWindow->getCurrentMouseDY();

+

+        if (dx != 0 || dy != 0)

+        {

+            // ...actually moved off center

+            if (gSavedSettings.getBOOL("InvertMouse"))

+            {

+                gAgent.pitch(mouse_sensitivity * -dy);

+            }

+            else

+            {

+                gAgent.pitch(mouse_sensitivity * dy);

+            }

+            LLVector3 skyward = gAgent.getReferenceUpVector();

+            gAgent.rotate(mouse_sensitivity * dx, skyward.mV[VX], skyward.mV[VY], skyward.mV[VZ]);

+

+            if (gSavedSettings.getBOOL("MouseSun"))

+            {

+                LLVector3 sunpos = LLViewerCamera::getInstance()->getAtAxis();

+                gSky.setSunDirectionCFR(sunpos);

+                gSavedSettings.setVector3("SkySunDefaultPosition", LLViewerCamera::getInstance()->getAtAxis());

+            }

+

+            if (gSavedSettings.getBOOL("MouseMoon"))

+            {

+                LLVector3 moonpos = LLViewerCamera::getInstance()->getAtAxis();

+                gSky.setMoonDirectionCFR(moonpos);

+                gSavedSettings.setVector3("SkyMoonDefaultPosition", LLViewerCamera::getInstance()->getAtAxis());

+            }

+

+            gViewerWindow->moveCursorToCenter();

+            gViewerWindow->hideCursor();

+        }

+

+        LL_DEBUGS("UserInput") << "hover handled by LLToolGun (mouselook)" << LL_ENDL;

+    }

+    else

+    {

+        LL_DEBUGS("UserInput") << "hover handled by LLToolGun (not mouselook)" << LL_ENDL;

+    }

+

+    // HACK to avoid assert: error checking system makes sure that the cursor is set during every handleHover.  This is actually a no-op since the cursor is hidden.

+    gViewerWindow->setCursor(UI_CURSOR_ARROW);

+

+    return true;

+}

+

+void LLToolGun::draw()

+{

+    if( gSavedSettings.getBOOL("ShowCrosshairs") )

+    {

+        LLUIImagePtr crosshair = LLUI::getUIImage("crosshairs.tga");

+        crosshair->draw(

+            ( gViewerWindow->getWorldViewRectScaled().getWidth() - crosshair->getWidth() ) / 2,

+            ( gViewerWindow->getWorldViewRectScaled().getHeight() - crosshair->getHeight() ) / 2);

+    }

+}