summaryrefslogtreecommitdiff
path: root/indra/newview/llfilepicker.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfilepicker.h')
-rw-r--r--indra/newview/llfilepicker.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h
index e0bd32fe70..8c89570174 100644
--- a/indra/newview/llfilepicker.h
+++ b/indra/newview/llfilepicker.h
@@ -54,6 +54,10 @@
#include <commdlg.h>
#endif
+#if LL_NFD
+#include "nfd.hpp"
+#endif
+
class LLFilePicker
{
public:
@@ -151,14 +155,18 @@ private:
// is enabled and if not, tidy up and indicate we're not allowed to do this.
bool check_local_file_access_enabled();
-#if LL_WINDOWS
+#if LL_NFD
+ std::vector<nfdfilteritem_t> setupFilter(ELoadFilter filter);
+#endif
+
+#if LL_WINDOWS && !LL_NFD
OPENFILENAMEW mOFN; // for open and save dialogs
WCHAR mFilesW[FILENAME_BUFFER_SIZE];
bool setupFilter(ELoadFilter filter);
#endif
-#if LL_DARWIN
+#if LL_DARWIN && !LL_NFD
S32 mPickOptions;
std::vector<std::string> mFileVector;
@@ -174,14 +182,6 @@ private:
void *userdata);
#endif
-#if LL_FLTK
- enum EType
- {
- eSaveFile, eOpenFile, eOpenMultiple
- };
- bool openFileDialog( int32_t filter, bool blocking, EType aType );
-#endif
-
std::vector<std::string> mFiles;
S32 mCurrentFile;
bool mLocked;