diff options
| author | Don Kjer <don@lindenlab.com> | 2013-09-10 14:59:33 -0700 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2013-09-10 14:59:33 -0700 |
| commit | 683c36ae2f81bd08d83d7e37c60f447196635834 (patch) | |
| tree | 05c60ca16e66a297a9ec19f0dc64c3f7664edcf0 /indra/newview/lldirpicker.h | |
| parent | 3a44c5c2a3e04ed8e7174bedb5753d29e6581019 (diff) | |
| parent | e6a68e1f09e4d056b4932111e09c3bff98acf29d (diff) | |
Automated merge
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 |