diff options
author | davep <none@none> | 2014-08-27 13:04:32 -0500 |
---|---|---|
committer | davep <none@none> | 2014-08-27 13:04:32 -0500 |
commit | 749d1665643b33d6c5b7b97e43f4eae996fbf465 (patch) | |
tree | eea7beb291f9fbffd5284da4f55701dcf5286720 /indra/newview/llvoicevivox.h | |
parent | d0428575fb9c3d285dc32e61808a877cb24efa89 (diff) | |
parent | b021c90e7bccdd0f9a916946e7716a00034254c2 (diff) |
Automated merge with https://bitbucket.org/davep/viewer-release
Diffstat (limited to 'indra/newview/llvoicevivox.h')
-rwxr-xr-x | indra/newview/llvoicevivox.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h index c325d72ba6..5e876fa2ef 100755 --- a/indra/newview/llvoicevivox.h +++ b/indra/newview/llvoicevivox.h @@ -38,7 +38,7 @@ class LLVivoxProtocolParser; #include "llviewerregion.h" #include "llcallingcard.h" // for LLFriendObserver -#ifdef LL_STANDALONE +#ifdef LL_USESYSTEMLIBS # include "expat.h" #else # include "expat/expat.h" |