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

diff --git a/indra/llmessage/patch_dct.h b/indra/llmessage/patch_dct.h
index 101231ec84..8c270d99bf 100644
--- a/indra/llmessage/patch_dct.h
+++ b/indra/llmessage/patch_dct.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file patch_dct.h
  * @brief Function declarations for DCT and IDCT routines
  *
  * $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$
  */
@@ -30,12 +30,12 @@
 class LLVector3;
 
 // Code Values
-const U8 ZERO_CODE	= 0x0;
+const U8 ZERO_CODE  = 0x0;
 const U8 ZERO_EOB = 0x2;
 const U8 POSITIVE_VALUE = 0x6;
 const U8 NEGATIVE_VALUE = 0x7;
 
-const S8 NORMAL_PATCH_SIZE	= 16;
+const S8 NORMAL_PATCH_SIZE  = 16;
 const S8 LARGE_PATCH_SIZE = 32;
 
 const U8 END_OF_PATCHES = 97;
@@ -45,35 +45,35 @@ const U8 END_OF_PATCHES = 97;
 // Top level header for group of headers
 //typedef struct LL_Group_Header
 //{
-//	U16  stride;		// 2 = 2
-//	U8  patch_size;		// 1 = 3
-//	U8  layer_type;		// 1 = 4
+//  U16  stride;        // 2 = 2
+//  U8  patch_size;     // 1 = 3
+//  U8  layer_type;     // 1 = 4
 //} LLGroupHeader;
 
 class LLGroupHeader
 {
 public:
-	U16	stride;			// 2 = 2
-	U8	patch_size;		// 1 = 3
-	U8	layer_type;		// 1 = 4
+    U16 stride;         // 2 = 2
+    U8  patch_size;     // 1 = 3
+    U8  layer_type;     // 1 = 4
 };
 
 // Individual patch header
 
 //typedef struct LL_Patch_Header
 //{
-//	F32 dc_offset;		// 4 bytes
-//	U16 range;			// 2 = 7 ((S16) FP range (breaks if we need > 32K meters in 1 patch)
-//	U8  quant_wbits;	// 1 = 8 (upper 4 bits is quant - 2, lower 4 bits is word bits - 2)
-//	U16	patchids;		// 2 = 10 (actually only uses 10 bits, 5 for each)
+//  F32 dc_offset;      // 4 bytes
+//  U16 range;          // 2 = 7 ((S16) FP range (breaks if we need > 32K meters in 1 patch)
+//  U8  quant_wbits;    // 1 = 8 (upper 4 bits is quant - 2, lower 4 bits is word bits - 2)
+//  U16 patchids;       // 2 = 10 (actually only uses 10 bits, 5 for each)
 //} LLPatchHeader;
 class LLPatchHeader
 {
 public:
-	F32	dc_offset;		// 4 bytes
-	U16	range;			// 2 = 7 ((S16) FP range (breaks if we need > 32K meters in 1 patch)
-	U8	quant_wbits;	// 1 = 8 (upper 4 bits is quant - 2, lower 4 bits is word bits - 2)
-	U16	patchids;		// 2 = 10 (actually only uses 10 bits, 5 for each)
+    F32 dc_offset;      // 4 bytes
+    U16 range;          // 2 = 7 ((S16) FP range (breaks if we need > 32K meters in 1 patch)
+    U8  quant_wbits;    // 1 = 8 (upper 4 bits is quant - 2, lower 4 bits is word bits - 2)
+    U16 patchids;       // 2 = 10 (actually only uses 10 bits, 5 for each)
 };
 
 // Compression routines