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

diff --git a/indra/llcommon/u64.cpp b/indra/llcommon/u64.cpp
index 02c2c15d26..1d39d3c3e5 100644
--- a/indra/llcommon/u64.cpp
+++ b/indra/llcommon/u64.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file u64.cpp
  * @brief Utilities to deal with U64s.
  *
  * $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$
  */
@@ -31,75 +31,75 @@
 
 U64 str_to_U64(const std::string& str)
 {
-	U64 result = 0;
-	const char *aptr = strpbrk(str.c_str(),"0123456789");
+    U64 result = 0;
+    const char *aptr = strpbrk(str.c_str(),"0123456789");
 
-	if (!aptr)
-	{
-		LL_WARNS() << "str_to_U64: Bad string to U64 conversion attempt: format\n" << LL_ENDL;
-	}
-	else
-	{
-		while ((*aptr >= '0') && (*aptr <= '9'))
-		{
-			result = result*10 + (*aptr++ - '0');
-		}
-	}
-	return (result);
+    if (!aptr)
+    {
+        LL_WARNS() << "str_to_U64: Bad string to U64 conversion attempt: format\n" << LL_ENDL;
+    }
+    else
+    {
+        while ((*aptr >= '0') && (*aptr <= '9'))
+        {
+            result = result*10 + (*aptr++ - '0');
+        }
+    }
+    return (result);
 }
 
 
-std::string U64_to_str(U64 value) 
+std::string U64_to_str(U64 value)
 {
-	std::string res;
-	U32 part1,part2,part3;
-	
-	part3 = (U32)(value % (U64)10000000);
-	
-	value /= 10000000;
-	part2 = (U32)(value % (U64)10000000);
-	
-	value /= 10000000;
-	part1 = (U32)(value % (U64)10000000);
-	
-	// three cases to avoid leading zeroes unless necessary
-	
-	if (part1)
-	{
-		res = llformat("%u%07u%07u",part1,part2,part3);
-	}
-	else if (part2)
-	{
-		res = llformat("%u%07u",part2,part3);
-	}
-	else
-	{
-		res = llformat("%u",part3);	
-	}
-	return res;
-} 
+    std::string res;
+    U32 part1,part2,part3;
+
+    part3 = (U32)(value % (U64)10000000);
+
+    value /= 10000000;
+    part2 = (U32)(value % (U64)10000000);
+
+    value /= 10000000;
+    part1 = (U32)(value % (U64)10000000);
+
+    // three cases to avoid leading zeroes unless necessary
+
+    if (part1)
+    {
+        res = llformat("%u%07u%07u",part1,part2,part3);
+    }
+    else if (part2)
+    {
+        res = llformat("%u%07u",part2,part3);
+    }
+    else
+    {
+        res = llformat("%u",part3);
+    }
+    return res;
+}
 
-char* U64_to_str(U64 value, char* result, S32 result_size) 
+char* U64_to_str(U64 value, char* result, S32 result_size)
 {
-	std::string res = U64_to_str(value);
-	LLStringUtil::copy(result, res.c_str(), result_size);
-	return result;
+    std::string res = U64_to_str(value);
+    LLStringUtil::copy(result, res.c_str(), result_size);
+    return result;
 }
 
 F64 U64_to_F64(const U64 value)
 {
-	S64 top_bits = (S64)(value >> 1);
-	F64 result = (F64)top_bits;
-	result *= 2.f;
-	result += (U32)(value & 0x01);
-	return result;
+    S64 top_bits = (S64)(value >> 1);
+    F64 result = (F64)top_bits;
+    result *= 2.f;
+    result += (U32)(value & 0x01);
+    return result;
 }
 
-U64	llstrtou64(const char* str, char** end, S32 base)
+U64 llstrtou64(const char* str, char** end, S32 base)
 {
 #ifdef LL_WINDOWS
-	return _strtoui64(str,end,base);
+    return _strtoui64(str,end,base);
 #else
-	return strtoull(str,end,base);
+    return strtoull(str,end,base);
 #endif
 }