Merge branch 'release/maint-b' into marchcat/b-merge

# Conflicts:
#	.github/workflows/build.yaml
#	indra/newview/app_settings/shaders/class2/deferred/alphaF.glsl
#	indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl
#	indra/newview/app_settings/shaders/class3/deferred/softenLightF.glsl
#	indra/newview/llfilepicker.cpp

1 files changed, 1 insertions, 47 deletions

diff --git a/indra/linux_crash_logger/llcrashloggerlinux.cpp b/indra/linux_crash_logger/llcrashloggerlinux.cpp
index 9b40de741e..7992f59b36 100644
--- a/indra/linux_crash_logger/llcrashloggerlinux.cpp
+++ b/indra/linux_crash_logger/llcrashloggerlinux.cpp
@@ -38,9 +38,6 @@
 #include "lldir.h"
 #include "llsdserialize.h"
 
-#if LL_GTK
-# include "gtk/gtk.h"
-#endif // LL_GTK
 
 #define MAX_LOADSTRING 100
 
@@ -54,52 +51,9 @@ static const char dialog_text[] =
 static const char dialog_title[] =
 "Second Life Crash Logger";
 
-#if LL_GTK
-static void response_callback (GtkDialog *dialog,
-                   gint       arg1,
-                   gpointer   user_data)
-{
-    gint *response = (gint*)user_data;
-    *response = arg1;
-    gtk_widget_destroy(GTK_WIDGET(dialog));
-    gtk_main_quit();
-}
-#endif // LL_GTK
-
 static BOOL do_ask_dialog(void)
 {
-#if LL_GTK
-    gtk_disable_setlocale();
-    if (!gtk_init_check(NULL, NULL)) {
-        LL_INFOS() << "Could not initialize GTK for 'ask to send crash report' dialog; not sending report." << LL_ENDL;
-        return FALSE;
-    }
-
-    GtkWidget *win = NULL;
-    GtkDialogFlags flags = GTK_DIALOG_MODAL;
-    GtkMessageType messagetype = GTK_MESSAGE_QUESTION;
-    GtkButtonsType buttons = GTK_BUTTONS_YES_NO;
-    gint response = GTK_RESPONSE_NONE;
-
-    win = gtk_message_dialog_new(NULL,
-                     flags, messagetype, buttons,
-                     "%s", dialog_text);
-    gtk_window_set_type_hint(GTK_WINDOW(win),
-                 GDK_WINDOW_TYPE_HINT_DIALOG);
-    gtk_window_set_title(GTK_WINDOW(win), dialog_title);
-    g_signal_connect (win,
-              "response",
-              G_CALLBACK (response_callback),
-              &response);
-    gtk_widget_show_all (win);
-    gtk_main();
-
-    return (GTK_RESPONSE_OK == response ||
-        GTK_RESPONSE_YES == response ||
-        GTK_RESPONSE_APPLY == response);
-#else
-    return FALSE;
-#endif // LL_GTK
+    // Ask to send crash report. Yes/No dialog.
 }
 
 LLCrashLoggerLinux::LLCrashLoggerLinux(void)