diff options
| author | Logan Dethrow <log@lindenlab.com> | 2012-12-07 17:50:37 -0500 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2012-12-07 17:50:37 -0500 |
| commit | b6a7c8fcfdaf9220accf832a4dc07efcd08c6eeb (patch) | |
| tree | 621f992abc5e2d0ccc596a824ba70828c463ae87 /indra/newview/lldirpicker.h | |
| parent | 954200e97f0283a2f16d19601129d64fb16449c2 (diff) | |
| parent | a15ec8d014307da35b792659964cd5478d1aafe7 (diff) | |
Merge in backed out changes.
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> |