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

diff --git a/indra/llmath/v4math.cpp b/indra/llmath/v4math.cpp
index a68028d74a..bee6fc3ee8 100644
--- a/indra/llmath/v4math.cpp
+++ b/indra/llmath/v4math.cpp
@@ -1,120 +1,120 @@
-/** 
- * @file v4math.cpp
- * @brief LLVector4 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 "v3math.h"
-#include "v4math.h"
-#include "m4math.h"
-#include "m3math.h"
-#include "llquaternion.h"
-
-// LLVector4
-
-// Axis-Angle rotations
-const LLVector4&	LLVector4::rotVec(const LLMatrix4 &mat)
-{
-	*this = *this * mat;
-	return *this;
-}
-
-const LLVector4&	LLVector4::rotVec(const LLQuaternion &q)
-{
-	*this = *this * q;
-	return *this;
-}
-
-const LLVector4&	LLVector4::scaleVec(const LLVector4& vec)
-{
-	mV[VX] *= vec.mV[VX];
-	mV[VY] *= vec.mV[VY];
-	mV[VZ] *= vec.mV[VZ];
-	mV[VW] *= vec.mV[VW];
-
-	return *this;
-}
-
-// Sets all values to absolute value of their original values
-// Returns true if data changed
-bool LLVector4::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; }
-	if (mV[2] < 0.f) { mV[2] = -mV[2]; ret = true; }
-	if (mV[3] < 0.f) { mV[3] = -mV[3]; ret = true; }
-
-	return ret;
-}
-
-
-std::ostream& operator<<(std::ostream& s, const LLVector4 &a) 
-{
-	s << "{ " << a.mV[VX] << ", " << a.mV[VY] << ", " << a.mV[VZ] << ", " << a.mV[VW] << " }";
-	return s;
-}
-
-
-// Non-member functions
-
-F32 angle_between( const LLVector4& a, const LLVector4& b )
-{
-	LLVector4 an = a;
-	LLVector4 bn = b;
-	an.normalize();
-	bn.normalize();
-	F32 cosine = an * bn;
-	F32 angle = (cosine >= 1.0f) ? 0.0f :
-		(cosine <= -1.0f) ? F_PI :
-		acos(cosine);
-	return angle;
-}
-
-bool are_parallel(const LLVector4 &a, const LLVector4 &b, F32 epsilon)
-{
-	LLVector4 an = a;
-	LLVector4 bn = b;
-	an.normalize();
-	bn.normalize();
-	F32 dot = an * bn;
-	if ( (1.0f - fabs(dot)) < epsilon)
-		return true;
-	return false;
-}
-
-
-LLVector3 vec4to3(const LLVector4 &vec)
-{
-	return LLVector3( vec.mV[VX], vec.mV[VY], vec.mV[VZ] );
-}
-
-LLVector4 vec3to4(const LLVector3 &vec)
-{
-	return LLVector4(vec.mV[VX], vec.mV[VY], vec.mV[VZ]);
-}
-
+/**

+ * @file v4math.cpp

+ * @brief LLVector4 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 "v3math.h"

+#include "v4math.h"

+#include "m4math.h"

+#include "m3math.h"

+#include "llquaternion.h"

+

+// LLVector4

+

+// Axis-Angle rotations

+const LLVector4&    LLVector4::rotVec(const LLMatrix4 &mat)

+{

+    *this = *this * mat;

+    return *this;

+}

+

+const LLVector4&    LLVector4::rotVec(const LLQuaternion &q)

+{

+    *this = *this * q;

+    return *this;

+}

+

+const LLVector4&    LLVector4::scaleVec(const LLVector4& vec)

+{

+    mV[VX] *= vec.mV[VX];

+    mV[VY] *= vec.mV[VY];

+    mV[VZ] *= vec.mV[VZ];

+    mV[VW] *= vec.mV[VW];

+

+    return *this;

+}

+

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

+// Returns true if data changed

+bool LLVector4::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; }

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

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

+

+    return ret;

+}

+

+

+std::ostream& operator<<(std::ostream& s, const LLVector4 &a)

+{

+    s << "{ " << a.mV[VX] << ", " << a.mV[VY] << ", " << a.mV[VZ] << ", " << a.mV[VW] << " }";

+    return s;

+}

+

+

+// Non-member functions

+

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

+{

+    LLVector4 an = a;

+    LLVector4 bn = b;

+    an.normalize();

+    bn.normalize();

+    F32 cosine = an * bn;

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

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

+        acos(cosine);

+    return angle;

+}

+

+bool are_parallel(const LLVector4 &a, const LLVector4 &b, F32 epsilon)

+{

+    LLVector4 an = a;

+    LLVector4 bn = b;

+    an.normalize();

+    bn.normalize();

+    F32 dot = an * bn;

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

+        return true;

+    return false;

+}

+

+

+LLVector3 vec4to3(const LLVector4 &vec)

+{

+    return LLVector3( vec.mV[VX], vec.mV[VY], vec.mV[VZ] );

+}

+

+LLVector4 vec3to4(const LLVector3 &vec)

+{

+    return LLVector4(vec.mV[VX], vec.mV[VY], vec.mV[VZ]);

+}

+