diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-08-29 03:40:10 -0700 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2023-08-29 03:40:10 -0700 |
| commit | c5bfe869154cd4708c9bca63f08cb4c958198638 (patch) | |
| tree | 6f79db9976863b2c1ea0f20bbb4049ee0cc98c1c /indra/llcommon/llsdserialize.h | |
| parent | fbecd348f897ee91a5639e7e9fe4f0578d72b8e2 (diff) | |
| parent | 89f2165b4170d9fddc10a55292c28750093a22a0 (diff) | |
Merge branch 'DRTVWR-559' into DRTVWR-583
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 0957ba9714..676b7bfd6a 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, llssize& cur_size, size_t* header_size = nullptr); +LL_COMMON_API char* strip_deprecated_header(char* in, llssize& cur_size, llssize* header_size = nullptr); #endif // LL_LLSDSERIALIZE_H |