diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-07 15:05:57 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-12-07 15:05:57 -0500 |
commit | 3c00c1ba4590e758f84f5c97f2d407aa7e605ad8 (patch) | |
tree | 0d6771596b57ecf87f2504066543b56bbcf65d80 /indra/llxuixml | |
parent | efe65d90e027e4385c97d76244844fa8660dc7ce (diff) | |
parent | d9b4570883652d647c05083c18fac1a088efd6e2 (diff) |
merge viewer-development into web-profiles
Diffstat (limited to 'indra/llxuixml')
-rw-r--r-- | indra/llxuixml/llxuiparser.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llxuixml/llxuiparser.cpp b/indra/llxuixml/llxuiparser.cpp index e1ad9a5c71..9942af6b37 100644 --- a/indra/llxuixml/llxuiparser.cpp +++ b/indra/llxuixml/llxuiparser.cpp @@ -29,7 +29,13 @@ #include "llxuiparser.h" #include "llxmlnode.h" + +#ifdef LL_STANDALONE +#include <expat.h> +#else #include "expat/expat.h" +#endif + #include <fstream> #include <boost/tokenizer.hpp> //#include <boost/spirit/include/qi.hpp> |