diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2021-09-23 16:28:14 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2021-09-23 16:28:14 -0400 |
commit | 274fc85fcbbe37f491f2d78b8b0f0b4ebb7bba26 (patch) | |
tree | e27d31612409d665120defe7f7d120ea5a876324 /indra/llcommon/llsdserialize.cpp | |
parent | 2b96d1bbe00c317ea8dfe420dd4167dde5d153ae (diff) | |
parent | 1d6bfb727a8015e82cd4060a0c73cf3fc719e818 (diff) |
DRTVWR-543: Merge branch 'DRTVWR-543-maint' into classic
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
-rw-r--r-- | indra/llcommon/llsdserialize.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index 022a5d4659..8b4a0ee6d8 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -37,7 +37,7 @@ #ifdef LL_USESYSTEMLIBS # include <zlib.h> #else -# include "zlib/zlib.h" // for davep's dirty little zip functions +# include "zlib-ng/zlib.h" // for davep's dirty little zip functions #endif #if !LL_WINDOWS |