diff options
author | simon <none@none> | 2014-07-07 16:17:53 -0700 |
---|---|---|
committer | simon <none@none> | 2014-07-07 16:17:53 -0700 |
commit | bfa42c9e28075cb35f80e6fce7d1db0443027052 (patch) | |
tree | b4e209e91cd173473f3c2033487647c5eb8c6b5d /indra/llprimitive/llmodel.cpp | |
parent | 114f7b5d0f46dfcbc9a94c1907e396b6e02700f6 (diff) | |
parent | 3e6698073cedc8b24068147cf6b7091f081ea125 (diff) |
Merge downstream code and become 3.7.12
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 df098e612f..b4963225dc 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" |