diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-07-18 14:26:30 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-07-18 14:38:18 -0700 |
| commit | ae63ed51aa4437bcca1c4f3813f1f6279facc107 (patch) | |
| tree | 4b74d7dbc258ec9236ab0154b6a83d6b36ce7d63 /indra/llcommon/llsdserialize.h | |
| parent | bb5e40a1fdc35b3a41925f91684bc76854338cfb (diff) | |
| parent | 178fc5cbaaed8a3e47ec5ded5c124ebafcb4d1ab (diff) | |
Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 (#292)
Diffstat (limited to 'indra/llcommon/llsdserialize.h')
| -rw-r--r-- | indra/llcommon/llsdserialize.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsdserialize.h b/indra/llcommon/llsdserialize.h index 2f12c6d1ff..0957ba9714 100644 --- a/indra/llcommon/llsdserialize.h +++ b/indra/llcommon/llsdserialize.h @@ -873,5 +873,5 @@ LL_COMMON_API std::string zip_llsd(LLSD& data); LL_COMMON_API U8* unzip_llsdNavMesh( bool& valid, size_t& outsize,std::istream& is, S32 size); // returns a pointer to the array or past the array if the deprecated header exists -LL_COMMON_API char* strip_deprecated_header(char* in, U32& cur_size, U32* header_size = nullptr); +LL_COMMON_API char* strip_deprecated_header(char* in, llssize& cur_size, size_t* header_size = nullptr); #endif // LL_LLSDSERIALIZE_H |