diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-05-31 16:35:20 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-05-31 16:35:20 -0400 |
| commit | 8a74efa38ba631be5400c4912a6339310968c9d7 (patch) | |
| tree | 9a76f8b2b31b3184857e29b965beb922fc166772 /indra/llcommon/llsdserialize.cpp | |
| parent | 25c20354b72343410ba0c6e4575a9fbc0671712d (diff) | |
| parent | ed92f1d8034dcaa84f808b3267c772202e7ce113 (diff) | |
SL-18330: Merge branch 'xcode-14.3' into fix-monterey
for strip_deprecated_header(header_size) and Python llsd module fixes.
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 c8dbcb2404..9181600f23 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -2388,7 +2388,7 @@ U8* unzip_llsdNavMesh( bool& valid, size_t& outsize, std::istream& is, S32 size return result; } -char* strip_deprecated_header(char* in, llssize& cur_size, U32* header_size) +char* strip_deprecated_header(char* in, llssize& cur_size, size_t* header_size) { const char* deprecated_header = "<? LLSD/Binary ?>"; constexpr size_t deprecated_header_size = 17; |