diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index f7a2f2273c80f22174f38f8333975c74aade04fe..814665fb69b3bfa15d66cbb982d81225f392fd1e 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -180,10 +180,6 @@ if (LINUX) LL_IGNORE_SIGCHLD _REENTRANT $<$<CONFIG:Release>:_FORTIFY_SOURCE=2> - GDK_DISABLE_DEPRECATED - GTK_DISABLE_DEPRECATED - GSEAL_ENABLE - GTK_DISABLE_SINGLE_INCLUDES ) add_compile_options( diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp index 392e38732fdcbeed846b8fe70efe78d6272f2791..7e9ddc071a2627027d7a120d9fbcd6bd1f50bd25 100644 --- a/indra/newview/lldirpicker.cpp +++ b/indra/newview/lldirpicker.cpp @@ -330,16 +330,6 @@ BOOL LLDirPicker::getDir(std::string* filename, bool blocking) if (mFilePicker) { - GtkWindow* picker = mFilePicker->buildFilePicker(false, true, - "dirpicker"); - - if (picker) - { - gtk_window_set_title(GTK_WINDOW(picker), LLTrans::getString("choose_the_directory").c_str()); - gtk_widget_show_all(GTK_WIDGET(picker)); - gtk_main(); - return (!mFilePicker->getFirstFile().empty()); - } } #endif // !LL_MESA_HEADLESS