diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2014-07-08 17:29:48 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2014-07-08 17:29:48 -0400 |
commit | 29bea5a6b94458e23559bdbeaae5a593100533b6 (patch) | |
tree | 5bd356450afd8da159542bfd444b653442004a45 /indra/llui/llxuiparser.cpp | |
parent | 053f436413c01e237accabace4dc5ff1eccca837 (diff) | |
parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) |
Merge. Refresh from viewer-release after 3.7.11 release.
Diffstat (limited to 'indra/llui/llxuiparser.cpp')
-rwxr-xr-x | indra/llui/llxuiparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llxuiparser.cpp b/indra/llui/llxuiparser.cpp index 4390ca83e9..37d88cb9f9 100755 --- a/indra/llui/llxuiparser.cpp +++ b/indra/llui/llxuiparser.cpp @@ -30,7 +30,7 @@ #include "llxmlnode.h" #include "llfasttimer.h" -#ifdef LL_STANDALONE +#ifdef LL_USESYSTEMLIBS #include <expat.h> #else #include "expat/expat.h" |