diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2022-06-29 14:00:50 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2022-06-29 14:00:50 -0700 |
| commit | 36fd0f7ca932cce5cd3614c16cd26aceedf57952 (patch) | |
| tree | ada1b461d97bf75b016a13bbc30c070ee74a1183 /indra/llprimitive/llmodel.cpp | |
| parent | 78e3edba6e998d8e97a1bff952073f62e58fd379 (diff) | |
| parent | 069304ca394d4d6069f00bb976f2d75e82bf675c (diff) | |
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/llprimitive/llmodel.cpp')
| -rw-r--r-- | 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 204ff63712..b1d371a399 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -36,7 +36,7 @@ #ifdef LL_USESYSTEMLIBS # include <zlib.h> #else -# include "zlib/zlib.h" +# include "zlib-ng/zlib.h" #endif std::string model_names[] = |