diff options
| author | simon_linden <none@none> | 2013-09-09 16:17:16 -0700 |
|---|---|---|
| committer | simon_linden <none@none> | 2013-09-09 16:17:16 -0700 |
| commit | e2019e8a3b5175eb6d7322fbe7c466f213854640 (patch) | |
| tree | 1e2fbeaeb249e0f3f0f91e94af213c1840438581 /indra/newview/llfilepicker.h | |
| parent | 6dd7e0c9ef587c6c05726d407bef8b51018a7a4b (diff) | |
| parent | 2c1d89c57ec21e4790eb14066d2291282a1000b4 (diff) | |
Merge downstream code with viewer-release
Diffstat (limited to 'indra/newview/llfilepicker.h')
| -rwxr-xr-x | indra/newview/llfilepicker.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h index 8a0ecb124a..f0f82c51db 100755 --- a/indra/newview/llfilepicker.h +++ b/indra/newview/llfilepicker.h @@ -39,8 +39,8 @@ #include <Carbon/Carbon.h> // AssertMacros.h does bad things. -#include "fix_macros.h" #undef verify +#undef check #undef require #include <vector> @@ -85,7 +85,8 @@ public: FFLOAD_MODEL = 9, FFLOAD_COLLADA = 10, FFLOAD_SCRIPT = 11, - FFLOAD_DICTIONARY = 12 + FFLOAD_DICTIONARY = 12, + FFLOAD_DIRECTORY = 13 //To call from lldirpicker. }; enum ESaveFilter @@ -159,15 +160,14 @@ private: #endif #if LL_DARWIN - NavDialogCreationOptions mNavOptions; + S32 mPickOptions; std::vector<std::string> mFileVector; UInt32 mFileIndex; - OSStatus doNavChooseDialog(ELoadFilter filter); - OSStatus doNavSaveDialog(ESaveFilter filter, const std::string& filename); - void getFilePath(SInt32 index); - void getFileName(SInt32 index); - static Boolean navOpenFilterProc(AEDesc *theItem, void *info, void *callBackUD, NavFilterModes filterMode); + bool doNavChooseDialog(ELoadFilter filter); + bool doNavSaveDialog(ESaveFilter filter, const std::string& filename); + //static Boolean navOpenFilterProc(AEDesc *theItem, void *info, void *callBackUD, NavFilterModes filterMode); + std::vector<std::string>* navOpenFilterProc(ELoadFilter filter); #endif #if LL_GTK |