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

# Conflicts:
#	autobuild.xml
#	indra/cmake/JsonCpp.cmake
#	indra/llimage/llimageworker.cpp
#	indra/llmessage/CMakeLists.txt
#	indra/llprimitive/llmodel.cpp
#	indra/llprimitive/llmodelloader.cpp
#	indra/llprimitive/llmodelloader.h
#	indra/llwindow/llkeyboard.cpp
#	indra/llwindow/llkeyboard.h
#	indra/llwindow/llkeyboardheadless.cpp
#	indra/llwindow/llkeyboardheadless.h
#	indra/llwindow/llkeyboardsdl.cpp
#	indra/llwindow/llkeyboardsdl.h
#	indra/llwindow/llwindowsdl.cpp
#	indra/llwindow/llwindowsdl.h
#	indra/newview/app_settings/shaders/class1/deferred/screenSpaceReflUtil.glsl
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llconversationloglist.cpp
#	indra/newview/lldirpicker.cpp
#	indra/newview/llfilepicker.cpp
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/llviewerobject.h
#	indra/newview/llxmlrpctransaction.cpp
#	indra/newview/viewer_manifest.py

1 files changed, 6 insertions, 25 deletions

diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h
index 75ff14f4cf..b99156c61e 100644
--- a/indra/newview/llfilepicker.h
+++ b/indra/newview/llfilepicker.h
@@ -54,19 +54,8 @@
 #include <commdlg.h>
 #endif
 
-extern "C" {
-// mostly for Linux, possible on others
-#if LL_GTK
-# include "gtk/gtk.h"
-#endif // LL_GTK
-}
-
 class LLFilePicker
 {
-#ifdef LL_GTK
-    friend class LLDirPicker;
-    friend void chooser_responder(GtkWidget *, gint, gpointer);
-#endif // LL_GTK
 public:
     // calling this before main() is undefined
     static LLFilePicker& instance( void ) { return sInstance; }
@@ -184,14 +173,12 @@ private:
                                  void *userdata);
 #endif
 
-#if LL_GTK
-    static void add_to_selectedfiles(gpointer data, gpointer user_data);
-    static void chooser_responder(GtkWidget *widget, gint response, gpointer user_data);
-    // we remember the last path that was accessed for a particular usage
-    std::map <std::string, std::string> mContextToPathMap;
-    std::string mCurContextName;
-    // we also remember the extension of the last added file.
-    std::string mCurrentExtension;
+#if LL_FLTK
+    enum EType
+    {
+     eSaveFile, eOpenFile, eOpenMultiple
+    };
+    bool openFileDialog( int32_t filter, bool blocking, EType aType );
 #endif
 
     std::vector<std::string> mFiles;
@@ -200,12 +187,6 @@ private:
 
     static LLFilePicker sInstance;
 
-protected:
-#if LL_GTK
-        GtkWindow* buildFilePicker(bool is_save, bool is_folder,
-                   std::string context = "generic");
-#endif
-
 public:
     // don't call these directly please.
     LLFilePicker();