diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-07-19 09:40:51 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-07-19 09:40:51 -0500 |
| commit | a44fa7b1a3392f74735c664d1852707f52eae00f (patch) | |
| tree | 4abcaa2712f7bcad8241e4e549f4b302417b6e04 /indra/llcommon/llsdserialize.h | |
| parent | bb08f68db1233870fd4615a68543220c8d608b93 (diff) | |
| parent | ca008cfc3165eefeb42b2894e3e99ecf4c21f0c8 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
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 |