diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-05-22 19:16:39 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-05-22 19:16:39 -0400 |
| commit | 25c20354b72343410ba0c6e4575a9fbc0671712d (patch) | |
| tree | 7b877f3af88c01df71f7d6bcfe141a6d3faad5d4 /indra | |
| parent | 041005f2860808bb807483775635abcd8c54fecf (diff) | |
| parent | 626bbe5032cab1fd2641ad02443e421567e7cce5 (diff) | |
SL-18837: Merge branch 'xcode-14.3' into fix-monterey.
Pull in fix to strip_deprecated_header() call.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llsdserialize.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index ad3f61ce71..c8dbcb2404 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -2193,9 +2193,9 @@ LLUZipHelper::EZipRresult LLUZipHelper::unzip_llsd(LLSD& data, std::istream& is, LLUZipHelper::EZipRresult LLUZipHelper::unzip_llsd(LLSD& data, const U8* in, S32 size) { U8* result = NULL; - U32 cur_size = 0; + llssize cur_size = 0; z_stream strm; - + constexpr U32 CHUNK = 1024 * 512; static thread_local std::unique_ptr<U8[]> out; |