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

diff --git a/indra/llmath/v3dmath.cpp b/indra/llmath/v3dmath.cpp
index cc7121da38..faa877a5cb 100644
--- a/indra/llmath/v3dmath.cpp
+++ b/indra/llmath/v3dmath.cpp
@@ -1,147 +1,147 @@
-/** 
- * @file v3dmath.cpp
- * @brief LLVector3d 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 <sstream>	// gcc 2.95.2 doesn't support sstream 
-
-#include "v3dmath.h"
-
-//#include "vmath.h"
-#include "v4math.h"
-#include "m4math.h"
-#include "m3math.h"
-#include "llquaternion.h"
-#include "llquantize.h"
-
-// LLVector3d
-// WARNING: Don't use these for global const definitions!
-// For example: 
-//		const LLQuaternion(0.5f * F_PI, LLVector3d::zero);
-// at the top of a *.cpp file might not give you what you think.
-const LLVector3d LLVector3d::zero(0,0,0);
-const LLVector3d LLVector3d::x_axis(1, 0, 0);
-const LLVector3d LLVector3d::y_axis(0, 1, 0);
-const LLVector3d LLVector3d::z_axis(0, 0, 1);
-const LLVector3d LLVector3d::x_axis_neg(-1, 0, 0);
-const LLVector3d LLVector3d::y_axis_neg(0, -1, 0);
-const LLVector3d LLVector3d::z_axis_neg(0, 0, -1);
-
-
-// Clamps each values to range (min,max).
-// Returns true if data changed.
-bool LLVector3d::clamp(F64 min, F64 max)
-{
-	bool ret{ false };
-
-	if (mdV[0] < min) { mdV[0] = min; ret = true; }
-	if (mdV[1] < min) { mdV[1] = min; ret = true; }
-	if (mdV[2] < min) { mdV[2] = min; ret = true; }
-
-	if (mdV[0] > max) { mdV[0] = max; ret = true; }
-	if (mdV[1] > max) { mdV[1] = max; ret = true; }
-	if (mdV[2] > max) { mdV[2] = max; ret = true; }
-
-	return ret;
-}
-
-// Sets all values to absolute value of their original values
-// Returns true if data changed
-bool LLVector3d::abs()
-{
-	bool ret{ false };
-
-	if (mdV[0] < 0.0) { mdV[0] = -mdV[0]; ret = true; }
-	if (mdV[1] < 0.0) { mdV[1] = -mdV[1]; ret = true; }
-	if (mdV[2] < 0.0) { mdV[2] = -mdV[2]; ret = true; }
-
-	return ret;
-}
-
-std::ostream& operator<<(std::ostream& s, const LLVector3d &a) 
-{
-	s << "{ " << a.mdV[VX] << ", " << a.mdV[VY] << ", " << a.mdV[VZ] << " }";
-	return s;
-}
-
-const LLVector3d& LLVector3d::operator=(const LLVector4 &a) 
-{
-	mdV[0] = a.mV[0];
-	mdV[1] = a.mV[1];
-	mdV[2] = a.mV[2];
-	return *this;
-}
-
-const LLVector3d&	LLVector3d::rotVec(const LLMatrix3 &mat)
-{
-	*this = *this * mat;
-	return *this;
-}
-
-const LLVector3d&	LLVector3d::rotVec(const LLQuaternion &q)
-{
-	*this = *this * q;
-	return *this;
-}
-
-const LLVector3d&	LLVector3d::rotVec(F64 angle, const LLVector3d &vec)
-{
-	if ( !vec.isExactlyZero() && angle )
-	{
-		*this = *this * LLMatrix3((F32)angle, vec);
-	}
-	return *this;
-}
-
-const LLVector3d&	LLVector3d::rotVec(F64 angle, F64 x, F64 y, F64 z)
-{
-	LLVector3d vec(x, y, z);
-	if ( !vec.isExactlyZero() && angle )
-	{
-		*this = *this * LLMatrix3((F32)angle, vec);
-	}
-	return *this;
-}
-
-
-bool LLVector3d::parseVector3d(const std::string& buf, LLVector3d* value)
-{
-	if( buf.empty() || value == nullptr)
-	{
-		return false;
-	}
-
-	LLVector3d v;
-	S32 count = sscanf( buf.c_str(), "%lf %lf %lf", v.mdV + 0, v.mdV + 1, v.mdV + 2 );
-	if( 3 == count )
-	{
-		value->setVec( v );
-		return true;
-	}
-
-	return false;
-}
-
+/**

+ * @file v3dmath.cpp

+ * @brief LLVector3d 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 <sstream>    // gcc 2.95.2 doesn't support sstream

+

+#include "v3dmath.h"

+

+//#include "vmath.h"

+#include "v4math.h"

+#include "m4math.h"

+#include "m3math.h"

+#include "llquaternion.h"

+#include "llquantize.h"

+

+// LLVector3d

+// WARNING: Don't use these for global const definitions!

+// For example:

+//      const LLQuaternion(0.5f * F_PI, LLVector3d::zero);

+// at the top of a *.cpp file might not give you what you think.

+const LLVector3d LLVector3d::zero(0,0,0);

+const LLVector3d LLVector3d::x_axis(1, 0, 0);

+const LLVector3d LLVector3d::y_axis(0, 1, 0);

+const LLVector3d LLVector3d::z_axis(0, 0, 1);

+const LLVector3d LLVector3d::x_axis_neg(-1, 0, 0);

+const LLVector3d LLVector3d::y_axis_neg(0, -1, 0);

+const LLVector3d LLVector3d::z_axis_neg(0, 0, -1);

+

+

+// Clamps each values to range (min,max).

+// Returns true if data changed.

+bool LLVector3d::clamp(F64 min, F64 max)

+{

+    bool ret{ false };

+

+    if (mdV[0] < min) { mdV[0] = min; ret = true; }

+    if (mdV[1] < min) { mdV[1] = min; ret = true; }

+    if (mdV[2] < min) { mdV[2] = min; ret = true; }

+

+    if (mdV[0] > max) { mdV[0] = max; ret = true; }

+    if (mdV[1] > max) { mdV[1] = max; ret = true; }

+    if (mdV[2] > max) { mdV[2] = max; ret = true; }

+

+    return ret;

+}

+

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

+// Returns true if data changed

+bool LLVector3d::abs()

+{

+    bool ret{ false };

+

+    if (mdV[0] < 0.0) { mdV[0] = -mdV[0]; ret = true; }

+    if (mdV[1] < 0.0) { mdV[1] = -mdV[1]; ret = true; }

+    if (mdV[2] < 0.0) { mdV[2] = -mdV[2]; ret = true; }

+

+    return ret;

+}

+

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

+{

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

+    return s;

+}

+

+const LLVector3d& LLVector3d::operator=(const LLVector4 &a)

+{

+    mdV[0] = a.mV[0];

+    mdV[1] = a.mV[1];

+    mdV[2] = a.mV[2];

+    return *this;

+}

+

+const LLVector3d&   LLVector3d::rotVec(const LLMatrix3 &mat)

+{

+    *this = *this * mat;

+    return *this;

+}

+

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

+{

+    *this = *this * q;

+    return *this;

+}

+

+const LLVector3d&   LLVector3d::rotVec(F64 angle, const LLVector3d &vec)

+{

+    if ( !vec.isExactlyZero() && angle )

+    {

+        *this = *this * LLMatrix3((F32)angle, vec);

+    }

+    return *this;

+}

+

+const LLVector3d&   LLVector3d::rotVec(F64 angle, F64 x, F64 y, F64 z)

+{

+    LLVector3d vec(x, y, z);

+    if ( !vec.isExactlyZero() && angle )

+    {

+        *this = *this * LLMatrix3((F32)angle, vec);

+    }

+    return *this;

+}

+

+

+bool LLVector3d::parseVector3d(const std::string& buf, LLVector3d* value)

+{

+    if( buf.empty() || value == nullptr)

+    {

+        return false;

+    }

+

+    LLVector3d v;

+    S32 count = sscanf( buf.c_str(), "%lf %lf %lf", v.mdV + 0, v.mdV + 1, v.mdV + 2 );

+    if( 3 == count )

+    {

+        value->setVec( v );

+        return true;

+    }

+

+    return false;

+}

+