diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-04-22 16:03:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-04-22 16:03:35 -0400 |
| commit | d00d37d23b68037fed8eeeffe21a87f7597086c3 (patch) | |
| tree | 2ce3ca6ce4038ab967277ebba1ca4b8a599c50e5 /indra/llcommon/llsdserialize.cpp | |
| parent | 6c8bddca3d5a790934535fdd6f176e28d181d76a (diff) | |
| parent | 776aadf4ef65681084268c3866058172c89b4259 (diff) | |
merge changes for OPEN-199
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
| -rwxr-xr-x | indra/llcommon/llsdserialize.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index ad4fce6f35..77841918ca 100755 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -34,7 +34,7 @@ #include <iostream> #include "apr_base64.h" -#ifdef LL_STANDALONE +#ifdef LL_USESYSTEMLIBS # include <zlib.h> #else # include "zlib/zlib.h" // for davep's dirty little zip functions |