Merge branch 'main' into marchcat/x-b-merge

# Conflicts:
#	autobuild.xml
#	indra/cmake/ConfigurePkgConfig.cmake
#	indra/cmake/ICU4C.cmake
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
#	indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/lloutfitslist.cpp

1 files changed, 20 insertions, 20 deletions

diff --git a/indra/linux_crash_logger/llcrashloggerlinux.cpp b/indra/linux_crash_logger/llcrashloggerlinux.cpp
index 22182d32a4..7992f59b36 100644
--- a/indra/linux_crash_logger/llcrashloggerlinux.cpp
+++ b/indra/linux_crash_logger/llcrashloggerlinux.cpp
@@ -30,7 +30,7 @@
 
 #include "linden_common.h"
 
-#include "indra_constants.h"	// CRASH_BEHAVIOR_ASK, CRASH_SETTING_NAME
+#include "indra_constants.h"    // CRASH_BEHAVIOR_ASK, CRASH_SETTING_NAME
 #include "llerror.h"
 #include "llfile.h"
 #include "lltimer.h"
@@ -53,7 +53,7 @@ static const char dialog_title[] =
 
 static BOOL do_ask_dialog(void)
 {
-	// Ask to send crash report. Yes/No dialog.
+    // Ask to send crash report. Yes/No dialog.
 }
 
 LLCrashLoggerLinux::LLCrashLoggerLinux(void)
@@ -70,31 +70,31 @@ void LLCrashLoggerLinux::gatherPlatformSpecificFiles()
 
 bool LLCrashLoggerLinux::frame()
 {
-	bool send_logs = true;
-	if(CRASH_BEHAVIOR_ASK == getCrashBehavior())
-	{
-		send_logs = do_ask_dialog();
-	}
-	else if(CRASH_BEHAVIOR_NEVER_SEND == getCrashBehavior())
-	{
-		send_logs = false;
-	}
-
-	if(send_logs)
-	{
-		sendCrashLogs();
-	}
-	return true;
+    bool send_logs = true;
+    if(CRASH_BEHAVIOR_ASK == getCrashBehavior())
+    {
+        send_logs = do_ask_dialog();
+    }
+    else if(CRASH_BEHAVIOR_NEVER_SEND == getCrashBehavior())
+    {
+        send_logs = false;
+    }
+
+    if(send_logs)
+    {
+        sendCrashLogs();
+    }
+    return true;
 }
 
 bool LLCrashLoggerLinux::cleanup()
 {
-	commonCleanup();
+    commonCleanup();
     mKeyMaster.releaseMaster();
-	return true;
+    return true;
 }
 
 void LLCrashLoggerLinux::updateApplication(const std::string& message)
 {
-	LLCrashLogger::updateApplication(message);
+    LLCrashLogger::updateApplication(message);
 }