Merge branch 'develop' into marchcat/xcode-16

1 files changed, 0 insertions, 36 deletions

diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp
index 51157fa430..17edca7ccb 100644
--- a/indra/newview/lldirpicker.cpp
+++ b/indra/newview/lldirpicker.cpp
@@ -41,11 +41,6 @@
 # include "llfilepicker.h"
 #endif
 
-#ifdef LL_FLTK
-  #include "FL/Fl.H"
-  #include "FL/Fl_Native_File_Chooser.H"
-#endif
-
 #if LL_WINDOWS
 #include <shlobj.h>
 #endif
@@ -219,28 +214,20 @@ 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)
@@ -253,39 +240,16 @@ bool LLDirPicker::getDir(std::string* filename, bool blocking)
         return false;
     }
 
-#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 )
-    {
-        char const *pDir = flDlg.filename(0);
-        if( pDir )
-            mDir = pDir;
-    }
-    else if( res == -1 )
-    {
-        LL_WARNS() << "FLTK failed: " <<  flDlg.errmsg() << LL_ENDL;
-    }
-    return !mDir.empty();
-#endif
     return false;
 }
 
 std::string LLDirPicker::getDirName()
 {
-#ifndef LL_FLTK
     if (mFilePicker)
     {
         return mFilePicker->getFirstFile();
     }
     return "";
-#else
-    return mDir;
-#endif
 }
 
 #else // not implemented