diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-09-10 20:17:43 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-09-10 20:17:43 +0300 |
| commit | 8a0b7eaaddf9170db5f205d94f680915da13239c (patch) | |
| tree | 7b2028fa1bbb4fa64adcc4a1298952465cd87539 /indra/newview/lldirpicker.h | |
| parent | d995782edf1a55c327ad3f3349bd9d4b6ec3d9e6 (diff) | |
| parent | e2019e8a3b5175eb6d7322fbe7c466f213854640 (diff) | |
Merge for MAINT-3117
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 |