diff options
author | dolphin <dolphin@lindenlab.com> | 2014-07-09 15:22:12 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2014-07-09 15:22:12 -0700 |
commit | 487fce4afaed69268db4fb996e420ba8984101d3 (patch) | |
tree | 365a4d16f511c083334b5315c6ffc882c558a300 /indra/llcommon/llsys.cpp | |
parent | e414dfad51b3747fa20c0023820980f23f1cad2c (diff) | |
parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) |
Merge with 3.7.11-release
Diffstat (limited to 'indra/llcommon/llsys.cpp')
-rwxr-xr-x | indra/llcommon/llsys.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 07fe259e47..06e118aa44 100755 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -33,7 +33,7 @@ #include "llsys.h" #include <iostream> -#ifdef LL_STANDALONE +#ifdef LL_USESYSTEMLIBS # include <zlib.h> #else # include "zlib/zlib.h" |