diff options
| author | Nicky Dasmijn <nicky.dasmijn@posteo.nl> | 2024-04-14 15:14:23 +0200 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-14 16:14:23 +0300 | 
| commit | 2d4de107f8fc3714f75f73fc9293c87eaf0e5acb (patch) | |
| tree | 012498aa7cde84f31bcba6008bea223e7a7bf2ee /indra/linux_crash_logger/llcrashloggerlinux.cpp | |
| parent | 286ef130349d45b13f613fd11eeb40f5fffdf259 (diff) | |
Feature/linux gtk removal (#1225)
* GTK remnants removal
Remove old GTK code and wire up some missing fltk logic in llfilepicker
This will leave linux_crash_logger as an empy stub which could be used as a skeleton in case crash logging gets implemented.
Otherwise linux_crash_logger and what is left of it in some cmake files can be deleted.
* Update SDL2 to latest version.
This revealed openal has also a dependebcy on sndio. Consequently the dependency was moved to OPENMAL.cmake and canot be dropped.
* Handle missing filetypes:
FFSAVE_GLTF,FFLOAD_GLTF, FFLOAD_MATERIAL, FFLOAD_MATERIAL_TEXTURE
Diffstat (limited to 'indra/linux_crash_logger/llcrashloggerlinux.cpp')
| -rw-r--r-- | indra/linux_crash_logger/llcrashloggerlinux.cpp | 58 | 
1 files changed, 6 insertions, 52 deletions
diff --git a/indra/linux_crash_logger/llcrashloggerlinux.cpp b/indra/linux_crash_logger/llcrashloggerlinux.cpp index 4092d43fc5..22182d32a4 100644 --- a/indra/linux_crash_logger/llcrashloggerlinux.cpp +++ b/indra/linux_crash_logger/llcrashloggerlinux.cpp @@ -1,25 +1,25 @@ -/**  +/**   * @file llcrashloggerlinux.cpp   * @brief Linux crash logger implementation   *   * $LicenseInfo:firstyear=2003&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$   */ @@ -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)  | 
