diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-07-10 00:23:01 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-07-10 00:23:01 +0300 |
| commit | 58c86cf59ee26dbadd359a28d8b16409c856e966 (patch) | |
| tree | 55d22b0f408f7b0bcda4b5dcefb12ff47bcfd286 /indra/llcommon/llsdserialize.cpp | |
| parent | 70c2472e427c2d58edd857d298ea9f1fbe4bd41f (diff) | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
merge changes for 3.7.12-release
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 b2add301f9..d49ff0feb5 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 |