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

diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp
index 335c586c1d..7a10662d3d 100644
--- a/indra/llcommon/llcommon.cpp
+++ b/indra/llcommon/llcommon.cpp
@@ -1,153 +1,153 @@
-/** 
- * @file llcommon.cpp
- *
- * $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$
- */
-
-#include "linden_common.h"
-
-#include "llcommon.h"
-
-#include "llmemory.h"
-#include "llthread.h"
-#include "lltrace.h"
-#include "lltracethreadrecorder.h"
-#include "llcleanup.h"
-
-thread_local bool gProfilerEnabled = false;
-
-#if (TRACY_ENABLE)
-// Override new/delete for tracy memory profiling
-
-void* ll_tracy_new(size_t size)
-{
-    void* ptr;
-    if (gProfilerEnabled)
-    {
-        //LL_PROFILE_ZONE_SCOPED_CATEGORY_MEMORY;
-        ptr = (malloc)(size);
-    }
-    else
-    {
-        ptr = (malloc)(size);
-    }
-    if (!ptr)
-    {
-        throw std::bad_alloc();
-    }
-    TracyAlloc(ptr, size);
-    return ptr;
-}
-
-void* operator new(size_t size)
-{
-    return ll_tracy_new(size);
-}
-
-void* operator new[](std::size_t count)
-{
-    return ll_tracy_new(count);
-}
-
-void ll_tracy_delete(void* ptr)
-{
-    TracyFree(ptr);
-    if (gProfilerEnabled)
-    {
-        //LL_PROFILE_ZONE_SCOPED_CATEGORY_MEMORY;
-        (free)(ptr);
-    }
-    else
-    {
-        (free)(ptr);
-    }
-}
-
-void operator delete(void *ptr) noexcept
-{
-    ll_tracy_delete(ptr);
-}
-
-void operator delete[](void* ptr) noexcept
-{
-    ll_tracy_delete(ptr);
-}
-
-// C-style malloc/free can't be so easily overridden, so we define tracy versions and use
-// a pre-processor #define in linden_common.h to redirect to them. The parens around the native
-// functions below prevents recursive substitution by the preprocessor.
-//
-// Unaligned mallocs are rare in LL code but hooking them causes problems in 3p lib code (looking at
-// you, Havok), so we'll only capture the aligned version.
-
-void *tracy_aligned_malloc(size_t size, size_t alignment)
-{
-    auto ptr = ll_aligned_malloc_fallback(size, alignment);
-    if (ptr) TracyAlloc(ptr, size);
-    return ptr;
-}
-
-void tracy_aligned_free(void *memblock)
-{
-    TracyFree(memblock);
-    ll_aligned_free_fallback(memblock);
-}
-
-#endif
-
-//static
-bool LLCommon::sAprInitialized = false;
-
-static LLTrace::ThreadRecorder* sMasterThreadRecorder = NULL;
-
-//static
-void LLCommon::initClass()
-{
-	if (!sAprInitialized)
-	{
-		ll_init_apr();
-		sAprInitialized = true;
-	}
-	LLTimer::initClass();
-	LLThreadSafeRefCount::initThreadSafeRefCount();
-	assert_main_thread();		// Make sure we record the main thread
-	if (!sMasterThreadRecorder)
-	{
-		sMasterThreadRecorder = new LLTrace::ThreadRecorder();
-		LLTrace::set_master_thread_recorder(sMasterThreadRecorder);
-	}
-}
-
-//static
-void LLCommon::cleanupClass()
-{
-	delete sMasterThreadRecorder;
-	sMasterThreadRecorder = NULL;
-	LLTrace::set_master_thread_recorder(NULL);
-	LLThreadSafeRefCount::cleanupThreadSafeRefCount();
-	SUBSYSTEM_CLEANUP_DBG(LLTimer);
-	if (sAprInitialized)
-	{
-		ll_cleanup_apr();
-		sAprInitialized = false;
-	}
-}
+/**

+ * @file llcommon.cpp

+ *

+ * $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$

+ */

+

+#include "linden_common.h"

+

+#include "llcommon.h"

+

+#include "llmemory.h"

+#include "llthread.h"

+#include "lltrace.h"

+#include "lltracethreadrecorder.h"

+#include "llcleanup.h"

+

+thread_local bool gProfilerEnabled = false;

+

+#if (TRACY_ENABLE)

+// Override new/delete for tracy memory profiling

+

+void* ll_tracy_new(size_t size)

+{

+    void* ptr;

+    if (gProfilerEnabled)

+    {

+        //LL_PROFILE_ZONE_SCOPED_CATEGORY_MEMORY;

+        ptr = (malloc)(size);

+    }

+    else

+    {

+        ptr = (malloc)(size);

+    }

+    if (!ptr)

+    {

+        throw std::bad_alloc();

+    }

+    TracyAlloc(ptr, size);

+    return ptr;

+}

+

+void* operator new(size_t size)

+{

+    return ll_tracy_new(size);

+}

+

+void* operator new[](std::size_t count)

+{

+    return ll_tracy_new(count);

+}

+

+void ll_tracy_delete(void* ptr)

+{

+    TracyFree(ptr);

+    if (gProfilerEnabled)

+    {

+        //LL_PROFILE_ZONE_SCOPED_CATEGORY_MEMORY;

+        (free)(ptr);

+    }

+    else

+    {

+        (free)(ptr);

+    }

+}

+

+void operator delete(void *ptr) noexcept

+{

+    ll_tracy_delete(ptr);

+}

+

+void operator delete[](void* ptr) noexcept

+{

+    ll_tracy_delete(ptr);

+}

+

+// C-style malloc/free can't be so easily overridden, so we define tracy versions and use

+// a pre-processor #define in linden_common.h to redirect to them. The parens around the native

+// functions below prevents recursive substitution by the preprocessor.

+//

+// Unaligned mallocs are rare in LL code but hooking them causes problems in 3p lib code (looking at

+// you, Havok), so we'll only capture the aligned version.

+

+void *tracy_aligned_malloc(size_t size, size_t alignment)

+{

+    auto ptr = ll_aligned_malloc_fallback(size, alignment);

+    if (ptr) TracyAlloc(ptr, size);

+    return ptr;

+}

+

+void tracy_aligned_free(void *memblock)

+{

+    TracyFree(memblock);

+    ll_aligned_free_fallback(memblock);

+}

+

+#endif

+

+//static

+bool LLCommon::sAprInitialized = false;

+

+static LLTrace::ThreadRecorder* sMasterThreadRecorder = NULL;

+

+//static

+void LLCommon::initClass()

+{

+    if (!sAprInitialized)

+    {

+        ll_init_apr();

+        sAprInitialized = true;

+    }

+    LLTimer::initClass();

+    LLThreadSafeRefCount::initThreadSafeRefCount();

+    assert_main_thread();       // Make sure we record the main thread

+    if (!sMasterThreadRecorder)

+    {

+        sMasterThreadRecorder = new LLTrace::ThreadRecorder();

+        LLTrace::set_master_thread_recorder(sMasterThreadRecorder);

+    }

+}

+

+//static

+void LLCommon::cleanupClass()

+{

+    delete sMasterThreadRecorder;

+    sMasterThreadRecorder = NULL;

+    LLTrace::set_master_thread_recorder(NULL);

+    LLThreadSafeRefCount::cleanupThreadSafeRefCount();

+    SUBSYSTEM_CLEANUP_DBG(LLTimer);

+    if (sAprInitialized)

+    {

+        ll_cleanup_apr();

+        sAprInitialized = false;

+    }

+}