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

diff --git a/indra/llmath/llsdutil_math.cpp b/indra/llmath/llsdutil_math.cpp
index 51e5e3764f..0ea1a9c77a 100644
--- a/indra/llmath/llsdutil_math.cpp
+++ b/indra/llmath/llsdutil_math.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llsdutil_math.cpp
  * @author Phoenix
  * @date 2006-05-24
@@ -7,21 +7,21 @@
  * $LicenseInfo:firstyear=2006&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$
  */
@@ -38,12 +38,12 @@
 #include "v4color.h"
 
 #if LL_WINDOWS
-#	define WIN32_LEAN_AND_MEAN
-#	include <winsock2.h>	// for htonl
+#   define WIN32_LEAN_AND_MEAN
+#   include <winsock2.h>    // for htonl
 #elif LL_LINUX
-#	include <netinet/in.h>
+#   include <netinet/in.h>
 #elif LL_DARWIN
-#	include <arpa/inet.h>
+#   include <arpa/inet.h>
 #endif
 
 #include "llsdserialize.h"
@@ -51,114 +51,114 @@
 // vector3
 LLSD ll_sd_from_vector3(const LLVector3& vec)
 {
-	LLSD rv;
-	rv.append((F64)vec.mV[VX]);
-	rv.append((F64)vec.mV[VY]);
-	rv.append((F64)vec.mV[VZ]);
-	return rv;
+    LLSD rv;
+    rv.append((F64)vec.mV[VX]);
+    rv.append((F64)vec.mV[VY]);
+    rv.append((F64)vec.mV[VZ]);
+    return rv;
 }
 
 LLVector3 ll_vector3_from_sd(const LLSD& sd, S32 start_index)
 {
-	LLVector3 rv;
-	rv.mV[VX] = (F32)sd[start_index].asReal();
-	rv.mV[VY] = (F32)sd[++start_index].asReal();
-	rv.mV[VZ] = (F32)sd[++start_index].asReal();
-	return rv;
+    LLVector3 rv;
+    rv.mV[VX] = (F32)sd[start_index].asReal();
+    rv.mV[VY] = (F32)sd[++start_index].asReal();
+    rv.mV[VZ] = (F32)sd[++start_index].asReal();
+    return rv;
 }
 
 // vector4
 LLSD ll_sd_from_vector4(const LLVector4& vec)
 {
-	LLSD rv;
-	rv.append((F64)vec.mV[VX]);
-	rv.append((F64)vec.mV[VY]);
-	rv.append((F64)vec.mV[VZ]);
-	rv.append((F64)vec.mV[VW]);
-	return rv;
+    LLSD rv;
+    rv.append((F64)vec.mV[VX]);
+    rv.append((F64)vec.mV[VY]);
+    rv.append((F64)vec.mV[VZ]);
+    rv.append((F64)vec.mV[VW]);
+    return rv;
 }
 
 LLVector4 ll_vector4_from_sd(const LLSD& sd, S32 start_index)
 {
-	LLVector4 rv;
-	rv.mV[VX] = (F32)sd[start_index].asReal();
-	rv.mV[VY] = (F32)sd[++start_index].asReal();
-	rv.mV[VZ] = (F32)sd[++start_index].asReal();
-	rv.mV[VW] = (F32)sd[++start_index].asReal();
-	return rv;
+    LLVector4 rv;
+    rv.mV[VX] = (F32)sd[start_index].asReal();
+    rv.mV[VY] = (F32)sd[++start_index].asReal();
+    rv.mV[VZ] = (F32)sd[++start_index].asReal();
+    rv.mV[VW] = (F32)sd[++start_index].asReal();
+    return rv;
 }
 
 // vector3d
 LLSD ll_sd_from_vector3d(const LLVector3d& vec)
 {
-	LLSD rv;
-	rv.append(vec.mdV[VX]);
-	rv.append(vec.mdV[VY]);
-	rv.append(vec.mdV[VZ]);
-	return rv;
+    LLSD rv;
+    rv.append(vec.mdV[VX]);
+    rv.append(vec.mdV[VY]);
+    rv.append(vec.mdV[VZ]);
+    return rv;
 }
 
 LLVector3d ll_vector3d_from_sd(const LLSD& sd, S32 start_index)
 {
-	LLVector3d rv;
-	rv.mdV[VX] = sd[start_index].asReal();
-	rv.mdV[VY] = sd[++start_index].asReal();
-	rv.mdV[VZ] = sd[++start_index].asReal();
-	return rv;
+    LLVector3d rv;
+    rv.mdV[VX] = sd[start_index].asReal();
+    rv.mdV[VY] = sd[++start_index].asReal();
+    rv.mdV[VZ] = sd[++start_index].asReal();
+    return rv;
 }
 
 //vector2
 LLSD ll_sd_from_vector2(const LLVector2& vec)
 {
-	LLSD rv;
-	rv.append((F64)vec.mV[VX]);
-	rv.append((F64)vec.mV[VY]);
-	return rv;
+    LLSD rv;
+    rv.append((F64)vec.mV[VX]);
+    rv.append((F64)vec.mV[VY]);
+    return rv;
 }
 
 LLVector2 ll_vector2_from_sd(const LLSD& sd)
 {
-	LLVector2 rv;
-	rv.mV[VX] = (F32)sd[0].asReal();
-	rv.mV[VY] = (F32)sd[1].asReal();
-	return rv;
+    LLVector2 rv;
+    rv.mV[VX] = (F32)sd[0].asReal();
+    rv.mV[VY] = (F32)sd[1].asReal();
+    return rv;
 }
 
 // Quaternion
 LLSD ll_sd_from_quaternion(const LLQuaternion& quat)
 {
-	LLSD rv;
-	rv.append((F64)quat.mQ[VX]);
-	rv.append((F64)quat.mQ[VY]);
-	rv.append((F64)quat.mQ[VZ]);
-	rv.append((F64)quat.mQ[VW]);
-	return rv;
+    LLSD rv;
+    rv.append((F64)quat.mQ[VX]);
+    rv.append((F64)quat.mQ[VY]);
+    rv.append((F64)quat.mQ[VZ]);
+    rv.append((F64)quat.mQ[VW]);
+    return rv;
 }
 
 LLQuaternion ll_quaternion_from_sd(const LLSD& sd)
 {
-	LLQuaternion quat;
-	quat.mQ[VX] = (F32)sd[0].asReal();
-	quat.mQ[VY] = (F32)sd[1].asReal();
-	quat.mQ[VZ] = (F32)sd[2].asReal();
-	quat.mQ[VW] = (F32)sd[3].asReal();
-	return quat;
+    LLQuaternion quat;
+    quat.mQ[VX] = (F32)sd[0].asReal();
+    quat.mQ[VY] = (F32)sd[1].asReal();
+    quat.mQ[VZ] = (F32)sd[2].asReal();
+    quat.mQ[VW] = (F32)sd[3].asReal();
+    return quat;
 }
 
 // color4
 LLSD ll_sd_from_color4(const LLColor4& c)
 {
-	LLSD rv;
-	rv.append(c.mV[0]);
-	rv.append(c.mV[1]);
-	rv.append(c.mV[2]);
-	rv.append(c.mV[3]);
-	return rv;
+    LLSD rv;
+    rv.append(c.mV[0]);
+    rv.append(c.mV[1]);
+    rv.append(c.mV[2]);
+    rv.append(c.mV[3]);
+    return rv;
 }
 
 LLColor4 ll_color4_from_sd(const LLSD& sd)
 {
-	LLColor4 c;
-	c.setValue(sd);
-	return c;
+    LLColor4 c;
+    c.setValue(sd);
+    return c;
 }