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

diff --git a/indra/llmath/v2math.cpp b/indra/llmath/v2math.cpp
index 22b37628d8..fd71c337fa 100644
--- a/indra/llmath/v2math.cpp
+++ b/indra/llmath/v2math.cpp
@@ -1,126 +1,126 @@
-/** 
- * @file v2math.cpp
- * @brief LLVector2 class implementation.
- *
- * $LicenseInfo:firstyear=2000&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 "linden_common.h"
-
-//#include "vmath.h"
-#include "v2math.h"
-#include "v3math.h"
-#include "v4math.h"
-#include "m4math.h"
-#include "m3math.h"
-#include "llquaternion.h"
-
-// LLVector2
-
-LLVector2 LLVector2::zero(0,0);
-
-
-// Non-member functions
-
-// Sets all values to absolute value of their original values
-// Returns true if data changed
-bool LLVector2::abs()
-{
-	bool ret{ false };
-
-	if (mV[0] < 0.f) { mV[0] = -mV[0]; ret = true; }
-	if (mV[1] < 0.f) { mV[1] = -mV[1]; ret = true; }
-	
-	return ret;
-}
-
-
-F32 angle_between(const LLVector2& a, const LLVector2& b)
-{
-	LLVector2 an = a;
-	LLVector2 bn = b;
-	an.normVec();
-	bn.normVec();
-	F32 cosine = an * bn;
-	F32 angle = (cosine >= 1.0f) ? 0.0f :
-				(cosine <= -1.0f) ? F_PI :
-				acos(cosine);
-	return angle;
-}
-
-bool are_parallel(const LLVector2 &a, const LLVector2 &b, float epsilon)
-{
-	LLVector2 an = a;
-	LLVector2 bn = b;
-	an.normVec();
-	bn.normVec();
-	F32 dot = an * bn;
-	if ( (1.0f - fabs(dot)) < epsilon)
-	{
-		return true;
-	}
-	return false;
-}
-
-
-F32	dist_vec(const LLVector2 &a, const LLVector2 &b)
-{
-	F32 x = a.mV[0] - b.mV[0];
-	F32 y = a.mV[1] - b.mV[1];
-	return (F32) sqrt( x*x + y*y );
-}
-
-F32	dist_vec_squared(const LLVector2 &a, const LLVector2 &b)
-{
-	F32 x = a.mV[0] - b.mV[0];
-	F32 y = a.mV[1] - b.mV[1];
-	return x*x + y*y;
-}
-
-F32	dist_vec_squared2D(const LLVector2 &a, const LLVector2 &b)
-{
-	F32 x = a.mV[0] - b.mV[0];
-	F32 y = a.mV[1] - b.mV[1];
-	return x*x + y*y;
-}
-
-LLVector2 lerp(const LLVector2 &a, const LLVector2 &b, F32 u)
-{
-	return LLVector2(
-		a.mV[VX] + (b.mV[VX] - a.mV[VX]) * u,
-		a.mV[VY] + (b.mV[VY] - a.mV[VY]) * u );
-}
-
-LLSD LLVector2::getValue() const
-{
-	LLSD ret;
-	ret[0] = mV[0];
-	ret[1] = mV[1];
-	return ret;
-}
-
-void LLVector2::setValue(const LLSD& sd)
-{
-	mV[0] = (F32) sd[0].asReal();
-	mV[1] = (F32) sd[1].asReal();
-}
-
+/**

+ * @file v2math.cpp

+ * @brief LLVector2 class implementation.

+ *

+ * $LicenseInfo:firstyear=2000&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 "linden_common.h"

+

+//#include "vmath.h"

+#include "v2math.h"

+#include "v3math.h"

+#include "v4math.h"

+#include "m4math.h"

+#include "m3math.h"

+#include "llquaternion.h"

+

+// LLVector2

+

+LLVector2 LLVector2::zero(0,0);

+

+

+// Non-member functions

+

+// Sets all values to absolute value of their original values

+// Returns true if data changed

+bool LLVector2::abs()

+{

+    bool ret{ false };

+

+    if (mV[0] < 0.f) { mV[0] = -mV[0]; ret = true; }

+    if (mV[1] < 0.f) { mV[1] = -mV[1]; ret = true; }

+

+    return ret;

+}

+

+

+F32 angle_between(const LLVector2& a, const LLVector2& b)

+{

+    LLVector2 an = a;

+    LLVector2 bn = b;

+    an.normVec();

+    bn.normVec();

+    F32 cosine = an * bn;

+    F32 angle = (cosine >= 1.0f) ? 0.0f :

+                (cosine <= -1.0f) ? F_PI :

+                acos(cosine);

+    return angle;

+}

+

+bool are_parallel(const LLVector2 &a, const LLVector2 &b, float epsilon)

+{

+    LLVector2 an = a;

+    LLVector2 bn = b;

+    an.normVec();

+    bn.normVec();

+    F32 dot = an * bn;

+    if ( (1.0f - fabs(dot)) < epsilon)

+    {

+        return true;

+    }

+    return false;

+}

+

+

+F32 dist_vec(const LLVector2 &a, const LLVector2 &b)

+{

+    F32 x = a.mV[0] - b.mV[0];

+    F32 y = a.mV[1] - b.mV[1];

+    return (F32) sqrt( x*x + y*y );

+}

+

+F32 dist_vec_squared(const LLVector2 &a, const LLVector2 &b)

+{

+    F32 x = a.mV[0] - b.mV[0];

+    F32 y = a.mV[1] - b.mV[1];

+    return x*x + y*y;

+}

+

+F32 dist_vec_squared2D(const LLVector2 &a, const LLVector2 &b)

+{

+    F32 x = a.mV[0] - b.mV[0];

+    F32 y = a.mV[1] - b.mV[1];

+    return x*x + y*y;

+}

+

+LLVector2 lerp(const LLVector2 &a, const LLVector2 &b, F32 u)

+{

+    return LLVector2(

+        a.mV[VX] + (b.mV[VX] - a.mV[VX]) * u,

+        a.mV[VY] + (b.mV[VY] - a.mV[VY]) * u );

+}

+

+LLSD LLVector2::getValue() const

+{

+    LLSD ret;

+    ret[0] = mV[0];

+    ret[1] = mV[1];

+    return ret;

+}

+

+void LLVector2::setValue(const LLSD& sd)

+{

+    mV[0] = (F32) sd[0].asReal();

+    mV[1] = (F32) sd[1].asReal();

+}

+