diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-08-16 08:25:50 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-08-16 08:25:50 -0400 |
| commit | 6cf6f81ae865d4e15b715a93408c7970b6936ce8 (patch) | |
| tree | c8232f05b4fb6ae8551d44d11517e89454be55ef /indra/llcommon/llsdserialize.h | |
| parent | 5430efbb31cfc0f57eac7fd130bb43aafa85143a (diff) | |
| parent | 48aecb5c8d10926caa62feb94231c3019162836a (diff) | |
DRTVWR-588: Merge branch 'fix-monterey' into DRTVWR-588-monterey
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 |