diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-08-23 12:26:14 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-08-23 12:26:14 -0700 |
| commit | c6d5f11f63dfa0ac65a2afebf88b3078f571e044 (patch) | |
| tree | 63fd8081ce450fd426ea717adc04d09b0da4b713 /indra/llcommon/llsdserialize.h | |
| parent | ef33902f220df35727ba54ee8bc3ed02bc53d6be (diff) | |
| parent | d454512050e636a19e4b7545515dea4f4b1bbf0d (diff) | |
Merge remote-tracking branch 'origin/main' 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 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 |