Merge branch 'release/maint-b' into nat/catch-test-blown-stack.

Retargeting PR #1496 to Maint B.

1 files changed, 33 insertions, 16 deletions

diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp
index bac435ad80..75875551f4 100644
--- a/indra/newview/lldirpicker.cpp
+++ b/indra/newview/lldirpicker.cpp
@@ -41,6 +41,10 @@
 # include "llfilepicker.h"
 #endif
 
+#ifdef LL_FLTK
+  #include "FL/Fl.H"
+  #include "FL/Fl_Native_File_Chooser.H"
+#endif
 //
 // Globals
 //
@@ -193,20 +197,28 @@ LLDirPicker::LLDirPicker() :
     mFileName(NULL),
     mLocked(false)
 {
+#ifndef LL_FLTK
     mFilePicker = new LLFilePicker();
+#endif
     reset();
 }
 
 LLDirPicker::~LLDirPicker()
 {
+#ifndef LL_FLTK
     delete mFilePicker;
+#endif
 }
 
 
 void LLDirPicker::reset()
 {
+#ifndef LL_FLTK
     if (mFilePicker)
         mFilePicker->reset();
+#else
+    mDir = "";
+#endif
 }
 
 BOOL LLDirPicker::getDir(std::string* filename, bool blocking)
@@ -219,33 +231,38 @@ BOOL LLDirPicker::getDir(std::string* filename, bool blocking)
         return FALSE;
     }
 
-#if !LL_MESA_HEADLESS
-
-    if (mFilePicker)
+#ifdef LL_FLTK
+    gViewerWindow->getWindow()->beforeDialog();
+    Fl_Native_File_Chooser flDlg;
+    flDlg.title(LLTrans::getString("choose_the_directory").c_str());
+    flDlg.type(Fl_Native_File_Chooser::BROWSE_DIRECTORY );
+    int res = flDlg.show();
+    gViewerWindow->getWindow()->afterDialog();
+    if( res == 0 )
     {
-        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());
-        }
+        char const *pDir = flDlg.filename(0);
+        if( pDir )
+            mDir = pDir;
     }
-#endif // !LL_MESA_HEADLESS
-
-    return FALSE;
+    else if( res == -1 )
+    {
+        LL_WARNS() << "FLTK failed: " <<  flDlg.errmsg() << LL_ENDL;
+    }
+    return !mDir.empty();
+#endif
 }
 
 std::string LLDirPicker::getDirName()
 {
+#ifndef LL_FLTK
     if (mFilePicker)
     {
         return mFilePicker->getFirstFile();
     }
     return "";
+#else
+    return mDir;
+#endif
 }
 
 #else // not implemented