diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-06-29 20:31:17 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-06-29 20:31:17 +0300 |
commit | 77ce594dec86eacadb39abf56c69d03b6f421a59 (patch) | |
tree | 206d5ffc8e7e275929d3dbbe0ef4fd098c8d7ca0 /indra/llprimitive/llmodel.cpp | |
parent | 192e7284aa7275f1b4e37bfd639bf317182bb5e2 (diff) | |
parent | 1e4f2ec07e32a142f35817d3186a124df3f8cd25 (diff) |
Merge branch 'master' into DRTVWR-544-maint
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 a394d1c4de..e52c675b60 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[] = |