diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-06-29 20:32:13 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-06-29 20:32:13 +0300 |
| commit | a7c9ca896069ce84d8c9798e36a5fc75d5ac9939 (patch) | |
| tree | 404e59ab738fe61d42bfc9780c4d8fa8bb25f423 /indra/newview/llviewerobjectlist.cpp | |
| parent | 10ab905c96bf979827951146d22e98214bf5a310 (diff) | |
| parent | 1e4f2ec07e32a142f35817d3186a124df3f8cd25 (diff) | |
Merge branch 'master' into DRTVWR-561-maint-O
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 0e585f13fc..55e2386d10 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" |