diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-11-23 12:04:27 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-11-23 12:04:27 -0500 |
| commit | d49d1def45482bccf4600a34bc2fd5693e05d329 (patch) | |
| tree | e6eadcf9db118b5ab1fe240011df981a77a09103 /indra/llprimitive/llmodel.cpp | |
| parent | b8a0549ac2be032d33a4fa427c8e430cd6df0cc6 (diff) | |
| parent | e3df3baff7aebd247737fd3dbcb382f3b12df10b (diff) | |
automated merge from mesh-development
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
| -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[] = |