diff options
| author | Don Kjer <don@lindenlab.com> | 2012-11-28 23:46:06 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-11-28 23:46:06 +0000 |
| commit | 96ef49df75c0248e4843f9a5b53f010b819d59f3 (patch) | |
| tree | 9f542fae939073bbb39464500d3fd477d1ed5fe5 /indra/newview/lldirpicker.h | |
| parent | dc71cae16b9c49a1d6b4d4a888c3a574049fd087 (diff) | |
| parent | e0432f98ee515f9777604aa784d28b63d2abfe40 (diff) | |
Automated merge
Diffstat (limited to 'indra/newview/lldirpicker.h')
| -rw-r--r-- | indra/newview/lldirpicker.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h index 2188b7edd0..682f9d6476 100644 --- a/indra/newview/lldirpicker.h +++ b/indra/newview/lldirpicker.h @@ -37,8 +37,8 @@ #include <Carbon/Carbon.h> // AssertMacros.h does bad things. +#include "fix_macros.h" #undef verify -#undef check #undef require #include <vector> |