diff options
| author | Aura Linden <aura@lindenlab.com> | 2013-01-23 10:41:52 -0800 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2013-01-23 10:41:52 -0800 |
| commit | 3f9a1da04273a2a3eb87b524541232a04545289b (patch) | |
| tree | f612af55900895ade0fba2802487aaf7b14a1da4 /indra/newview/lldirpicker.h | |
| parent | e3fa3addd0f91ac4c88624be6539b253f64136d3 (diff) | |
Recovered changes for dirpicker and filepicker
Diffstat (limited to 'indra/newview/lldirpicker.h')
| -rw-r--r-- | indra/newview/lldirpicker.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h index 682f9d6476..9cc62431ef 100644 --- a/indra/newview/lldirpicker.h +++ b/indra/newview/lldirpicker.h @@ -34,11 +34,10 @@ #include "stdtypes.h" #if LL_DARWIN -#include <Carbon/Carbon.h> // AssertMacros.h does bad things. -#include "fix_macros.h" #undef verify +#undef check #undef require #include <vector> @@ -77,15 +76,7 @@ private: void buildDirname( void ); bool check_local_file_access_enabled(); -#if LL_DARWIN - NavDialogCreationOptions mNavOptions; - static pascal void doNavCallbackEvent(NavEventCallbackMessage callBackSelector, - NavCBRecPtr callBackParms, void* callBackUD); - OSStatus doNavChooseDialog(); - -#endif - -#if LL_LINUX || LL_SOLARIS +#if LL_LINUX || LL_SOLARIS || LL_DARWIN // On Linux we just implement LLDirPicker on top of LLFilePicker LLFilePicker *mFilePicker; #endif |