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/newview/llvoicevivox.cpp | |
| parent | 053f436413c01e237accabace4dc5ff1eccca837 (diff) | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
Merge. Refresh from viewer-release after 3.7.11 release.
Diffstat (limited to 'indra/newview/llvoicevivox.cpp')
| -rwxr-xr-x | indra/newview/llvoicevivox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 9937a1c42a..54b4119331 100755 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -35,7 +35,7 @@ #include "llbufferstream.h" #include "llfile.h" #include "llmenugl.h" -#ifdef LL_STANDALONE +#ifdef LL_USESYSTEMLIBS # include "expat.h" #else # include "expat/expat.h" |