diff options
| author | simon <none@none> | 2014-07-07 16:17:53 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-07-07 16:17:53 -0700 |
| commit | bfa42c9e28075cb35f80e6fce7d1db0443027052 (patch) | |
| tree | b4e209e91cd173473f3c2033487647c5eb8c6b5d /indra/llui/llxuiparser.cpp | |
| parent | 114f7b5d0f46dfcbc9a94c1907e396b6e02700f6 (diff) | |
| parent | 3e6698073cedc8b24068147cf6b7091f081ea125 (diff) | |
Merge downstream code and become 3.7.12
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" |