summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorBoroondas Gupte <hg@boroon.dasgupta.ch>2010-10-25 11:39:56 +0200
committerBoroondas Gupte <hg@boroon.dasgupta.ch>2010-10-25 11:39:56 +0200
commit0aba56e2db8d939539688e0489cbee9176f0848b (patch)
tree440e7a68e1c151761c5a7b45697946151006649e /indra/llprimitive
parent71de5f622a7917f78823a7e7840194e1b0f8f070 (diff)
parent03acf85c36f2de235d6bf8a07b8a253c30679570 (diff)
CTS-320 (part 3 of 3) use system zlib for standalone
Diffstat (limited to 'indra/llprimitive')
-rw-r--r--indra/llprimitive/llmodel.cpp8
1 files changed, 7 insertions, 1 deletions
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