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

diff --git a/indra/llcommon/llstacktrace.cpp b/indra/llcommon/llstacktrace.cpp
index 285bdb83ec..05e71b8203 100644
--- a/indra/llcommon/llstacktrace.cpp
+++ b/indra/llcommon/llstacktrace.cpp
@@ -1,168 +1,168 @@
-/** 
- * @file llstacktrace.cpp
- * @brief stack tracing functionality
- *
- * $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$
- */
-
-#include "linden_common.h"
-#include "llstacktrace.h"
-
-#ifdef LL_WINDOWS
-
-#include <iostream>
-#include <sstream>
-
-#include "llwin32headerslean.h"
-#pragma warning (push)
-#pragma warning (disable:4091) // a microsoft header has warnings. Very nice.
-#include <dbghelp.h>
-#pragma warning (pop)
-
-typedef USHORT NTAPI RtlCaptureStackBackTrace_Function(
-    IN ULONG frames_to_skip,
-    IN ULONG frames_to_capture,
-    OUT PVOID *backtrace,
-    OUT PULONG backtrace_hash);
-
-static RtlCaptureStackBackTrace_Function* const RtlCaptureStackBackTrace_fn =
-   (RtlCaptureStackBackTrace_Function*)
-   GetProcAddress(GetModuleHandleA("ntdll.dll"), "RtlCaptureStackBackTrace");
-
-bool ll_get_stack_trace(std::vector<std::string>& lines)
-{
-	const S32 MAX_STACK_DEPTH = 32;
-	const S32 STRING_NAME_LENGTH = 200;
-	const S32 FRAME_SKIP = 2;
-	static bool symbolsLoaded = false;
-	static bool firstCall = true;
-
-	HANDLE hProc = GetCurrentProcess();
-
-	// load the symbols if they're not loaded
-	if(!symbolsLoaded && firstCall)
-	{
-		symbolsLoaded = SymInitialize(hProc, NULL, true);
-		firstCall = false;
-	}
-
-	// if loaded, get the call stack
-	if(symbolsLoaded)
-	{
-		// create the frames to hold the addresses
-		void* frames[MAX_STACK_DEPTH];
-		memset(frames, 0, sizeof(void*)*MAX_STACK_DEPTH);
-		S32 depth = 0;
-
-		// get the addresses
-		depth = RtlCaptureStackBackTrace_fn(FRAME_SKIP, MAX_STACK_DEPTH, frames, NULL);
-
-		IMAGEHLP_LINE64 line;
-		memset(&line, 0, sizeof(IMAGEHLP_LINE64));
-		line.SizeOfStruct = sizeof(IMAGEHLP_LINE64);
-
-		// create something to hold address info
-		PIMAGEHLP_SYMBOL64 pSym;
-		pSym = (PIMAGEHLP_SYMBOL64)malloc(sizeof(IMAGEHLP_SYMBOL64) + STRING_NAME_LENGTH);
-		memset(pSym, 0, sizeof(IMAGEHLP_SYMBOL64) + STRING_NAME_LENGTH);
-		pSym->MaxNameLength = STRING_NAME_LENGTH;
-		pSym->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL64);
-
-		// get address info for each address frame
-		// and store
-		for(S32 i=0; i < depth; i++)
-		{
-			std::stringstream stack_line;
-            bool ret;
-
-			DWORD64 addr = (DWORD64)frames[i];
-			ret = SymGetSymFromAddr64(hProc, addr, 0, pSym);
-			if(ret)
-			{
-				stack_line << pSym->Name << " ";
-			}
-
-			DWORD dummy;
-			ret = SymGetLineFromAddr64(hProc, addr, &dummy, &line);
-			if(ret)
-			{
-				std::string file_name = line.FileName;
-				std::string::size_type index = file_name.rfind("\\");
-				stack_line << file_name.substr(index + 1, file_name.size()) << ":" << line.LineNumber; 
-			}
-
-			lines.push_back(stack_line.str());
-		}
-		
-		free(pSym);
-
-		// TODO: figure out a way to cleanup symbol loading
-		// Not hugely necessary, however.
-		//SymCleanup(hProc);
-		return true;
-	}
-	else
-	{
-		lines.push_back("Stack Trace Failed.  PDB symbol info not loaded");
-	}
-
-	return false;
-}
-
-void ll_get_stack_trace_internal(std::vector<std::string>& lines)
-{
-	const S32 MAX_STACK_DEPTH = 100;
-	const S32 STRING_NAME_LENGTH = 256;
-
-	HANDLE process = GetCurrentProcess();
-	SymInitialize( process, NULL, true );
-
-	void *stack[MAX_STACK_DEPTH];
-
-	unsigned short frames = RtlCaptureStackBackTrace_fn( 0, MAX_STACK_DEPTH, stack, NULL );
-	SYMBOL_INFO *symbol = (SYMBOL_INFO*)calloc(sizeof(SYMBOL_INFO) + STRING_NAME_LENGTH * sizeof(char), 1);
-	symbol->MaxNameLen = STRING_NAME_LENGTH-1;
-	symbol->SizeOfStruct = sizeof(SYMBOL_INFO);
-
-	for(unsigned int i = 0; i < frames; i++) 
-	{
-		SymFromAddr(process, (DWORD64)(stack[i]), 0, symbol);
-		lines.push_back(symbol->Name);
-	}
-
-	free( symbol );
-}
-
-#else
-
-bool ll_get_stack_trace(std::vector<std::string>& lines)
-{
-	return false;
-}
-
-void ll_get_stack_trace_internal(std::vector<std::string>& lines)
-{
-
-}
-
-#endif
-
+/**

+ * @file llstacktrace.cpp

+ * @brief stack tracing functionality

+ *

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

+ */

+

+#include "linden_common.h"

+#include "llstacktrace.h"

+

+#ifdef LL_WINDOWS

+

+#include <iostream>

+#include <sstream>

+

+#include "llwin32headerslean.h"

+#pragma warning (push)

+#pragma warning (disable:4091) // a microsoft header has warnings. Very nice.

+#include <dbghelp.h>

+#pragma warning (pop)

+

+typedef USHORT NTAPI RtlCaptureStackBackTrace_Function(

+    IN ULONG frames_to_skip,

+    IN ULONG frames_to_capture,

+    OUT PVOID *backtrace,

+    OUT PULONG backtrace_hash);

+

+static RtlCaptureStackBackTrace_Function* const RtlCaptureStackBackTrace_fn =

+   (RtlCaptureStackBackTrace_Function*)

+   GetProcAddress(GetModuleHandleA("ntdll.dll"), "RtlCaptureStackBackTrace");

+

+bool ll_get_stack_trace(std::vector<std::string>& lines)

+{

+    const S32 MAX_STACK_DEPTH = 32;

+    const S32 STRING_NAME_LENGTH = 200;

+    const S32 FRAME_SKIP = 2;

+    static bool symbolsLoaded = false;

+    static bool firstCall = true;

+

+    HANDLE hProc = GetCurrentProcess();

+

+    // load the symbols if they're not loaded

+    if(!symbolsLoaded && firstCall)

+    {

+        symbolsLoaded = SymInitialize(hProc, NULL, true);

+        firstCall = false;

+    }

+

+    // if loaded, get the call stack

+    if(symbolsLoaded)

+    {

+        // create the frames to hold the addresses

+        void* frames[MAX_STACK_DEPTH];

+        memset(frames, 0, sizeof(void*)*MAX_STACK_DEPTH);

+        S32 depth = 0;

+

+        // get the addresses

+        depth = RtlCaptureStackBackTrace_fn(FRAME_SKIP, MAX_STACK_DEPTH, frames, NULL);

+

+        IMAGEHLP_LINE64 line;

+        memset(&line, 0, sizeof(IMAGEHLP_LINE64));

+        line.SizeOfStruct = sizeof(IMAGEHLP_LINE64);

+

+        // create something to hold address info

+        PIMAGEHLP_SYMBOL64 pSym;

+        pSym = (PIMAGEHLP_SYMBOL64)malloc(sizeof(IMAGEHLP_SYMBOL64) + STRING_NAME_LENGTH);

+        memset(pSym, 0, sizeof(IMAGEHLP_SYMBOL64) + STRING_NAME_LENGTH);

+        pSym->MaxNameLength = STRING_NAME_LENGTH;

+        pSym->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL64);

+

+        // get address info for each address frame

+        // and store

+        for(S32 i=0; i < depth; i++)

+        {

+            std::stringstream stack_line;

+            bool ret;

+

+            DWORD64 addr = (DWORD64)frames[i];

+            ret = SymGetSymFromAddr64(hProc, addr, 0, pSym);

+            if(ret)

+            {

+                stack_line << pSym->Name << " ";

+            }

+

+            DWORD dummy;

+            ret = SymGetLineFromAddr64(hProc, addr, &dummy, &line);

+            if(ret)

+            {

+                std::string file_name = line.FileName;

+                std::string::size_type index = file_name.rfind("\\");

+                stack_line << file_name.substr(index + 1, file_name.size()) << ":" << line.LineNumber;

+            }

+

+            lines.push_back(stack_line.str());

+        }

+

+        free(pSym);

+

+        // TODO: figure out a way to cleanup symbol loading

+        // Not hugely necessary, however.

+        //SymCleanup(hProc);

+        return true;

+    }

+    else

+    {

+        lines.push_back("Stack Trace Failed.  PDB symbol info not loaded");

+    }

+

+    return false;

+}

+

+void ll_get_stack_trace_internal(std::vector<std::string>& lines)

+{

+    const S32 MAX_STACK_DEPTH = 100;

+    const S32 STRING_NAME_LENGTH = 256;

+

+    HANDLE process = GetCurrentProcess();

+    SymInitialize( process, NULL, true );

+

+    void *stack[MAX_STACK_DEPTH];

+

+    unsigned short frames = RtlCaptureStackBackTrace_fn( 0, MAX_STACK_DEPTH, stack, NULL );

+    SYMBOL_INFO *symbol = (SYMBOL_INFO*)calloc(sizeof(SYMBOL_INFO) + STRING_NAME_LENGTH * sizeof(char), 1);

+    symbol->MaxNameLen = STRING_NAME_LENGTH-1;

+    symbol->SizeOfStruct = sizeof(SYMBOL_INFO);

+

+    for(unsigned int i = 0; i < frames; i++)

+    {

+        SymFromAddr(process, (DWORD64)(stack[i]), 0, symbol);

+        lines.push_back(symbol->Name);

+    }

+

+    free( symbol );

+}

+

+#else

+

+bool ll_get_stack_trace(std::vector<std::string>& lines)

+{

+    return false;

+}

+

+void ll_get_stack_trace_internal(std::vector<std::string>& lines)

+{

+

+}

+

+#endif

+