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

diff --git a/indra/llmath/tests/alignment_test.cpp b/indra/llmath/tests/alignment_test.cpp
index 5ee3c45502..eb6fa4a3b8 100644
--- a/indra/llmath/tests/alignment_test.cpp
+++ b/indra/llmath/tests/alignment_test.cpp
@@ -7,21 +7,21 @@
  * $LicenseInfo:firstyear=2011&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2011, 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$
  */
@@ -50,27 +50,27 @@ LL_ALIGN_PREFIX(16)
 class MyVector4a
 {
 public:
-	void* operator new(size_t size)
-	{
-		return ll_aligned_malloc_16(size);
-	}
-
-	void operator delete(void *p)
-	{
-		ll_aligned_free_16(p);
-	}
-
-	void* operator new[](size_t count)
-	{	// try to allocate count bytes for an array
-		return ll_aligned_malloc_16(count);
-	}
-
-	void operator delete[](void *p)
-	{
-		ll_aligned_free_16(p);
-	}
-
-	LLQuad mQ;
+    void* operator new(size_t size)
+    {
+        return ll_aligned_malloc_16(size);
+    }
+
+    void operator delete(void *p)
+    {
+        ll_aligned_free_16(p);
+    }
+
+    void* operator new[](size_t count)
+    {   // try to allocate count bytes for an array
+        return ll_aligned_malloc_16(count);
+    }
+
+    void operator delete[](void *p)
+    {
+        ll_aligned_free_16(p);
+    }
+
+    LLQuad mQ;
 } LL_ALIGN_POSTFIX(16);
 
 
@@ -79,36 +79,36 @@ template<> template<>
 void alignment_test_object_t::test<1>()
 {
 #   ifdef LL_DEBUG
-//	skip("This test fails on Windows when compiled in debug mode.");
+//  skip("This test fails on Windows when compiled in debug mode.");
 #   endif
-	
-	const int num_tests = 7;
-	void *align_ptr;
-	for (int i=0; i<num_tests; i++)
-	{
-		align_ptr = ll_aligned_malloc_16(sizeof(MyVector4a));
-		ensure("ll_aligned_malloc_16 failed", is_aligned(align_ptr,16));
-
-		align_ptr = ll_aligned_realloc_16(align_ptr,2*sizeof(MyVector4a), sizeof(MyVector4a));
-		ensure("ll_aligned_realloc_16 failed", is_aligned(align_ptr,16));
-
-		ll_aligned_free_16(align_ptr);
-
-		align_ptr = ll_aligned_malloc_32(sizeof(MyVector4a));
-		ensure("ll_aligned_malloc_32 failed", is_aligned(align_ptr,32));
-		ll_aligned_free_32(align_ptr);
-	}
+
+    const int num_tests = 7;
+    void *align_ptr;
+    for (int i=0; i<num_tests; i++)
+    {
+        align_ptr = ll_aligned_malloc_16(sizeof(MyVector4a));
+        ensure("ll_aligned_malloc_16 failed", is_aligned(align_ptr,16));
+
+        align_ptr = ll_aligned_realloc_16(align_ptr,2*sizeof(MyVector4a), sizeof(MyVector4a));
+        ensure("ll_aligned_realloc_16 failed", is_aligned(align_ptr,16));
+
+        ll_aligned_free_16(align_ptr);
+
+        align_ptr = ll_aligned_malloc_32(sizeof(MyVector4a));
+        ensure("ll_aligned_malloc_32 failed", is_aligned(align_ptr,32));
+        ll_aligned_free_32(align_ptr);
+    }
 }
 
 // In-place allocation of objects and arrays.
 template<> template<>
 void alignment_test_object_t::test<2>()
 {
-	MyVector4a vec1;
-	ensure("LLAlignment vec1 unaligned", is_aligned(&vec1,16));
-	
-	MyVector4a veca[12];
-	ensure("LLAlignment veca unaligned", is_aligned(veca,16));
+    MyVector4a vec1;
+    ensure("LLAlignment vec1 unaligned", is_aligned(&vec1,16));
+
+    MyVector4a veca[12];
+    ensure("LLAlignment veca unaligned", is_aligned(veca,16));
 }
 
 // Heap allocation of objects and arrays.
@@ -116,26 +116,26 @@ template<> template<>
 void alignment_test_object_t::test<3>()
 {
 #   ifdef LL_DEBUG
-//	skip("This test fails on Windows when compiled in debug mode.");
+//  skip("This test fails on Windows when compiled in debug mode.");
 #   endif
-	
-	const int ARR_SIZE = 7;
-	for(int i=0; i<ARR_SIZE; i++)
-	{
-		MyVector4a *vecp = new MyVector4a;
-		ensure("LLAlignment vecp unaligned", is_aligned(vecp,16));
-		delete vecp;
-	}
-
-	MyVector4a *veca = new MyVector4a[ARR_SIZE];
-	//std::cout << "veca base is " << (S32) veca << std::endl;
-	ensure("LLAligment veca base", is_aligned(veca,16));
-	for(int i=0; i<ARR_SIZE; i++)
-	{
-		std::cout << "veca[" << i << "]" << std::endl;
-		ensure("LLAlignment veca member unaligned", is_aligned(&veca[i],16));
-	}
-	delete [] veca; 
+
+    const int ARR_SIZE = 7;
+    for(int i=0; i<ARR_SIZE; i++)
+    {
+        MyVector4a *vecp = new MyVector4a;
+        ensure("LLAlignment vecp unaligned", is_aligned(vecp,16));
+        delete vecp;
+    }
+
+    MyVector4a *veca = new MyVector4a[ARR_SIZE];
+    //std::cout << "veca base is " << (S32) veca << std::endl;
+    ensure("LLAligment veca base", is_aligned(veca,16));
+    for(int i=0; i<ARR_SIZE; i++)
+    {
+        std::cout << "veca[" << i << "]" << std::endl;
+        ensure("LLAlignment veca member unaligned", is_aligned(&veca[i],16));
+    }
+    delete [] veca;
 }
 
 }