diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-05-22 05:50:46 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-05-22 05:50:46 +0800 |
| commit | f900a9ae67c61b3e53c36c119440cbc3710a2f7c (patch) | |
| tree | 341a78d70c88e414f501a4023318ceabb338d6ec /indra/llprimitive/llmodel.cpp | |
| parent | c06c7e0b0eb4b7a7aaa70a3559b08b18c73aea17 (diff) | |
| parent | 060bebcd3cbb5fbf6045bd777364947a2d8963d3 (diff) | |
Merge branch 'main' into 2025.04
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 4e3e49ec9f..6b4bb3a8b0 100644 --- a/indra/llprimitive/llmodel.cpp +++ b/indra/llprimitive/llmodel.cpp @@ -33,7 +33,7 @@ #include "llvector4a.h" #include "hbxxh.h" -#ifdef LL_USESYSTEMLIBS +#if 1 # include <zlib.h> #else # include "zlib-ng/zlib.h" |