diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-06-29 21:02:57 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2022-06-29 21:03:15 +0300 |
| commit | b0e98406488f712220175141f2b0f45a95082f12 (patch) | |
| tree | 4a965843d24f984caf12722c7809a84797ddc212 /indra/newview/llviewerobjectlist.cpp | |
| parent | 76c8a7ff0b57e7856613960391be7c400384183b (diff) | |
| parent | 1e4f2ec07e32a142f35817d3186a124df3f8cd25 (diff) | |
Merge branch 'master' into DRTVWR-539
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" |