summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorsimon <none@none>2014-07-07 14:49:45 -0700
committersimon <none@none>2014-07-07 14:49:45 -0700
commit3e6698073cedc8b24068147cf6b7091f081ea125 (patch)
tree59d8759c554af8a733668dae9668ca6fd92bf820 /indra/llprimitive
parent770a0a2dea0bd503f88b35d3d440208bcd303e54 (diff)
parent226929f8f5b8bc1080d0082b2595d689238df2b8 (diff)
Merge viewer-release and become version 3.7.12
Diffstat (limited to 'indra/llprimitive')
-rwxr-xr-xindra/llprimitive/llmodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index b0456e3ccf..57a698b98f 100755
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -44,7 +44,7 @@
#pragma warning (default : 4264)
#endif
-#ifdef LL_STANDALONE
+#ifdef LL_USESYSTEMLIBS
# include <zlib.h>
#else
# include "zlib/zlib.h"