diff options
author | Callum Prentice <callum@lindenlab.com> | 2014-07-15 10:15:15 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2014-07-15 10:15:15 -0700 |
commit | edec2d0559905d33907380d0b304b9e28f74082e (patch) | |
tree | 8f66c497878a24b488039f54b04f03960fbb6c96 /indra/llprimitive/llmodel.cpp | |
parent | f11dd1d8a3dc4ba9a3c23563126e11ee971e219f (diff) | |
parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) |
Merge with viewer-release
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
-rwxr-xr-x | indra/llprimitive/llmodel.cpp | 2 |
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" |