diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-11-22 18:42:34 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-11-22 18:42:34 -0500 |
| commit | be1fd73390cab288c75ef99e704f3aa195a0c4ac (patch) | |
| tree | fe30b2a5d2c73b0167e61d2037c268a50d361e6e /indra/llprimitive | |
| parent | 65a66458c2e5ab369f22c5a52b93db6ef7305609 (diff) | |
| parent | 0aba56e2db8d939539688e0489cbee9176f0848b (diff) | |
CTS-320 SH-465 FIX use system zlib for standalone builds
pulling boroondas' changes to change our includes to use the system versions
of zlib if doing a standalone build. Code changes are minimal, and appear to
work correctly. Approved. - Nyx
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llmodel.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp index eacf2377fe..b486e17194 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -34,7 +34,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 + std::string model_names[] = |