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

diff --git a/indra/llcommon/llendianswizzle.h b/indra/llcommon/llendianswizzle.h
index 4c08074a9c..d56eb7be2e 100644
--- a/indra/llcommon/llendianswizzle.h
+++ b/indra/llcommon/llendianswizzle.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llendianswizzle.h
  * @brief Functions for in-place bit swizzling
  *
  * $LicenseInfo:firstyear=2002&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$
  */
@@ -28,63 +28,63 @@
 #define LL_LLENDIANSWIZZLE_H
 
 /* This function is intended to be used for in-place swizzling, particularly after fread() of
-	binary values from a file.  Such as:
-	
-	numRead = fread(scale.mV, sizeof(float), 3, fp);
-	llendianswizzle(scale.mV, sizeof(float), 3);
-	
-	It assumes that the values in the file are LITTLE endian, so it's a no-op on a little endian machine.
-	
-	It keys off of typesize to do the correct swizzle, so make sure that typesize is the size of the native type.
-	
-	64-bit types are not yet handled.
+    binary values from a file.  Such as:
+
+    numRead = fread(scale.mV, sizeof(float), 3, fp);
+    llendianswizzle(scale.mV, sizeof(float), 3);
+
+    It assumes that the values in the file are LITTLE endian, so it's a no-op on a little endian machine.
+
+    It keys off of typesize to do the correct swizzle, so make sure that typesize is the size of the native type.
+
+    64-bit types are not yet handled.
 */
 
 #ifdef LL_LITTLE_ENDIAN
-	// little endian is native for most things.
-	inline void llendianswizzle(void *,int,int)
-	{
-		// Nothing to do
-	}
+    // little endian is native for most things.
+    inline void llendianswizzle(void *,int,int)
+    {
+        // Nothing to do
+    }
 #endif
 
 #ifdef LL_BIG_ENDIAN
-	// big endian requires a bit of work.
-	inline void llendianswizzle(void *p,int typesize, int count)
-	{
-		int i;
-		switch(typesize)
-		{
-			case 2:
-			{
-				U16 temp;
-				for(i=count ;i!=0 ;i--)
-				{
-					temp = ((U16*)p)[0];
-					((U16*)p)[0] = 	((temp >> 8)  & 0x000000FF) | ((temp << 8)  & 0x0000FF00);
-					p = (void*)(((U16*)p) + 1);
-				}
-			}
-			break;
-			
-			case 4:
-			{
-				U32 temp;
-				for(i=count; i!=0; i--)
-				{
-					temp = ((U32*)p)[0];
-					((U32*)p)[0] = 	
-							((temp >> 24) & 0x000000FF) | 
-							((temp >> 8)  & 0x0000FF00) | 
-							((temp << 8)  & 0x00FF0000) |
-							((temp << 24) & 0xFF000000);
-					p = (void*)(((U32*)p) + 1);
-				}
-			}
-			break;
-		}
-		
-	}
+    // big endian requires a bit of work.
+    inline void llendianswizzle(void *p,int typesize, int count)
+    {
+        int i;
+        switch(typesize)
+        {
+            case 2:
+            {
+                U16 temp;
+                for(i=count ;i!=0 ;i--)
+                {
+                    temp = ((U16*)p)[0];
+                    ((U16*)p)[0] =  ((temp >> 8)  & 0x000000FF) | ((temp << 8)  & 0x0000FF00);
+                    p = (void*)(((U16*)p) + 1);
+                }
+            }
+            break;
+
+            case 4:
+            {
+                U32 temp;
+                for(i=count; i!=0; i--)
+                {
+                    temp = ((U32*)p)[0];
+                    ((U32*)p)[0] =
+                            ((temp >> 24) & 0x000000FF) |
+                            ((temp >> 8)  & 0x0000FF00) |
+                            ((temp << 8)  & 0x00FF0000) |
+                            ((temp << 24) & 0xFF000000);
+                    p = (void*)(((U32*)p) + 1);
+                }
+            }
+            break;
+        }
+
+    }
 #endif
 
 // Use this when working with a single integral value you want swizzled