diff options
author | simon <none@none> | 2013-09-09 12:59:17 -0700 |
---|---|---|
committer | simon <none@none> | 2013-09-09 12:59:17 -0700 |
commit | e7ac4695e31821118dd1bc9ddc95f46f012abbda (patch) | |
tree | f971732dddf9173d5a9a75163f5e8312a3d5054a /indra/newview/lldirpicker.h | |
parent | 36dea0dad802158a0e546220163f4461fbd3e204 (diff) | |
parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) |
Merge viewer-release
Diffstat (limited to 'indra/newview/lldirpicker.h')
-rwxr-xr-x | 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 100755 --- 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 |