diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-07-12 00:42:54 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-07-12 00:42:54 +0300 |
| commit | 43de9f202e9c09bc46e9b4e51ac87425b99b9a55 (patch) | |
| tree | 99ea03d6f0af12135b4a428ec0b7c595a7d3ee9f /indra/llcommon/llsdserialize.cpp | |
| parent | 3f98411c56f4daa06c9102346a8dd37af18d2cb6 (diff) | |
| parent | 1e4f2ec07e32a142f35817d3186a124df3f8cd25 (diff) | |
Merge branch 'master' into DRTVWR-528
# Conflicts:
# indra/newview/llappviewer.cpp
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 |