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

diff --git a/indra/llmath/xform.cpp b/indra/llmath/xform.cpp
index 838dee0a54..239c1ca195 100644
--- a/indra/llmath/xform.cpp
+++ b/indra/llmath/xform.cpp
@@ -1,119 +1,119 @@
-/** 
- * @file xform.cpp
- *
- * $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 "linden_common.h"
-
-#include "xform.h"
-
-LLXform::LLXform()
-{
-	init();
-}
-
-LLXform::~LLXform()
-{
-}
-
-// Link optimization - don't inline these LL_WARNS()
-void LLXform::warn(const char* const msg)
-{
-	LL_WARNS() << msg << LL_ENDL;
-}
-
-LLXform* LLXform::getRoot() const
-{
-	const LLXform* root = this;
-	while(root->mParent)
-	{
-		root = root->mParent;
-	}
-	return (LLXform*)root;
-}
-
-bool LLXform::isRoot() const
-{
-	return (!mParent);
-}
-
-bool LLXform::isRootEdit() const
-{
-	return (!mParent);
-}
-
-LLXformMatrix::~LLXformMatrix()
-{
-}
-
-void LLXformMatrix::update()
-{
-	if (mParent) 
-	{
-		mWorldPosition = mPosition;
-		if (mParent->getScaleChildOffset())
-		{
-			mWorldPosition.scaleVec(mParent->getScale());
-		}
-		mWorldPosition *= mParent->getWorldRotation();
-		mWorldPosition += mParent->getWorldPosition();
-		mWorldRotation = mRotation * mParent->getWorldRotation();
-	}
-	else
-	{
-		mWorldPosition = mPosition;
-		mWorldRotation = mRotation;
-	}
-}
-
-void LLXformMatrix::updateMatrix(bool update_bounds)
-{
-	update();
-
-	mWorldMatrix.initAll(mScale, mWorldRotation, mWorldPosition);
-
-	if (update_bounds && (mChanged & MOVED))
-	{
-		mMin.mV[0] = mMax.mV[0] = mWorldMatrix.mMatrix[3][0];
-		mMin.mV[1] = mMax.mV[1] = mWorldMatrix.mMatrix[3][1];
-		mMin.mV[2] = mMax.mV[2] = mWorldMatrix.mMatrix[3][2];
-
-		F32 f0 = (fabs(mWorldMatrix.mMatrix[0][0])+fabs(mWorldMatrix.mMatrix[1][0])+fabs(mWorldMatrix.mMatrix[2][0])) * 0.5f;
-		F32 f1 = (fabs(mWorldMatrix.mMatrix[0][1])+fabs(mWorldMatrix.mMatrix[1][1])+fabs(mWorldMatrix.mMatrix[2][1])) * 0.5f;
-		F32 f2 = (fabs(mWorldMatrix.mMatrix[0][2])+fabs(mWorldMatrix.mMatrix[1][2])+fabs(mWorldMatrix.mMatrix[2][2])) * 0.5f;
-
-		mMin.mV[0] -= f0; 
-		mMin.mV[1] -= f1; 
-		mMin.mV[2] -= f2; 
-
-		mMax.mV[0] += f0; 
-		mMax.mV[1] += f1; 
-		mMax.mV[2] += f2; 
-	}
-}
-
-void LLXformMatrix::getMinMax(LLVector3& min, LLVector3& max) const
-{
-	min = mMin;
-	max = mMax;
-}
+/**

+ * @file xform.cpp

+ *

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

+

+#include "xform.h"

+

+LLXform::LLXform()

+{

+    init();

+}

+

+LLXform::~LLXform()

+{

+}

+

+// Link optimization - don't inline these LL_WARNS()

+void LLXform::warn(const char* const msg)

+{

+    LL_WARNS() << msg << LL_ENDL;

+}

+

+LLXform* LLXform::getRoot() const

+{

+    const LLXform* root = this;

+    while(root->mParent)

+    {

+        root = root->mParent;

+    }

+    return (LLXform*)root;

+}

+

+bool LLXform::isRoot() const

+{

+    return (!mParent);

+}

+

+bool LLXform::isRootEdit() const

+{

+    return (!mParent);

+}

+

+LLXformMatrix::~LLXformMatrix()

+{

+}

+

+void LLXformMatrix::update()

+{

+    if (mParent)

+    {

+        mWorldPosition = mPosition;

+        if (mParent->getScaleChildOffset())

+        {

+            mWorldPosition.scaleVec(mParent->getScale());

+        }

+        mWorldPosition *= mParent->getWorldRotation();

+        mWorldPosition += mParent->getWorldPosition();

+        mWorldRotation = mRotation * mParent->getWorldRotation();

+    }

+    else

+    {

+        mWorldPosition = mPosition;

+        mWorldRotation = mRotation;

+    }

+}

+

+void LLXformMatrix::updateMatrix(bool update_bounds)

+{

+    update();

+

+    mWorldMatrix.initAll(mScale, mWorldRotation, mWorldPosition);

+

+    if (update_bounds && (mChanged & MOVED))

+    {

+        mMin.mV[0] = mMax.mV[0] = mWorldMatrix.mMatrix[3][0];

+        mMin.mV[1] = mMax.mV[1] = mWorldMatrix.mMatrix[3][1];

+        mMin.mV[2] = mMax.mV[2] = mWorldMatrix.mMatrix[3][2];

+

+        F32 f0 = (fabs(mWorldMatrix.mMatrix[0][0])+fabs(mWorldMatrix.mMatrix[1][0])+fabs(mWorldMatrix.mMatrix[2][0])) * 0.5f;

+        F32 f1 = (fabs(mWorldMatrix.mMatrix[0][1])+fabs(mWorldMatrix.mMatrix[1][1])+fabs(mWorldMatrix.mMatrix[2][1])) * 0.5f;

+        F32 f2 = (fabs(mWorldMatrix.mMatrix[0][2])+fabs(mWorldMatrix.mMatrix[1][2])+fabs(mWorldMatrix.mMatrix[2][2])) * 0.5f;

+

+        mMin.mV[0] -= f0;

+        mMin.mV[1] -= f1;

+        mMin.mV[2] -= f2;

+

+        mMax.mV[0] += f0;

+        mMax.mV[1] += f1;

+        mMax.mV[2] += f2;

+    }

+}

+

+void LLXformMatrix::getMinMax(LLVector3& min, LLVector3& max) const

+{

+    min = mMin;

+    max = mMax;

+}