diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-06-29 18:00:26 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-06-29 18:00:26 -0500 |
| commit | 56ae3e0a083aefcbd6d7c955bb2c7e9e58000a4b (patch) | |
| tree | 53ad2998536760442a00b1d239a7223e864ba3c9 /indra/newview/llviewerobjectlist.cpp | |
| parent | fd6b5ea8c3df7e8b4b648ac7ecc9f30eedd4b7c0 (diff) | |
| parent | 36fd0f7ca932cce5cd3614c16cd26aceedf57952 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 47a996d894..389f5087e2 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -72,7 +72,7 @@ #ifdef LL_USESYSTEMLIBS #include <zlib.h> #else -#include "zlib/zlib.h" +#include "zlib-ng/zlib.h" #endif #include "object_flags.h" |