diff options
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 7 | ||||
| -rw-r--r-- | indra/llprimitive/llmodel.cpp | 8 |
3 files changed, 14 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index c8125c675f..f3f6c0ff15 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -149,6 +149,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 fdeb93e27f..3054bb8d09 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 diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index 82765c740f..f65f39e755 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -39,7 +39,13 @@ #include "dae/daeErrorHandler.h" #include "dom/domConstants.h" #include "dom/domMesh.h" -#include "zlib/zlib.h" + +#ifdef LL_STANDALONE +# include <zlib.h> +#else +# include "zlib/zlib.h" +#endif + #if LL_MESH_ENABLED |