diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2014-11-14 08:49:08 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2014-11-14 08:49:08 -0500 |
| commit | 6be2f0ba2b672fc37cd6d4e8adf62ae71bf8c842 (patch) | |
| tree | 86740538c9c2a2ff1359cf96db2521d99c8aebe7 /indra/llui/llrngwriter.cpp | |
| parent | 2301cf800f40101baed7a5936683d0b1e4968be1 (diff) | |
| parent | 316e35ad2a735784cfc309ea9fd74d2d9d1f985a (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llui/llrngwriter.cpp')
| -rwxr-xr-x | indra/llui/llrngwriter.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llui/llrngwriter.cpp b/indra/llui/llrngwriter.cpp index cd9fe3610e..523bc7c667 100755 --- a/indra/llui/llrngwriter.cpp +++ b/indra/llui/llrngwriter.cpp @@ -28,7 +28,16 @@ #include "llrngwriter.h" #include "lluicolor.h" + +#if LL_DARWIN +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdelete-incomplete" +#include "lluictrlfactory.h" +#pragma clang diagnostic pop +#elif #include "lluictrlfactory.h" +#endif + #include "boost/bind.hpp" static LLInitParam::Parser::parser_read_func_map_t sReadFuncs; |