diff options
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index ef9f09bd23..f31d0f0204 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -142,6 +142,7 @@ Blakar Ogre blino Nakamura VWR-17 Boroondas Gupte + CTS-320 SNOW-278 VWR-233 WEB-262 diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index c341b15539..b1e88b0f8f 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -39,7 +39,12 @@ #include <iostream> #include "apr_base64.h" -#include "zlib/zlib.h" // for davep's dirty little zip functions + +#ifdef LL_STANDALONE +# include <zlib.h> +#else +# include "zlib/zlib.h" // for davep's dirty little zip functions +#endif #if !LL_WINDOWS #include <netinet/in.h> // htonl & ntohl |