diff options
author | Erik Kundiman <erik@megapahit.org> | 2024-04-20 14:08:23 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2024-04-20 14:08:23 +0800 |
commit | 23a35d763bca645ce628d80ebd939c979590724c (patch) | |
tree | 434e8413c209d8a29fe93ed17ea2717817660a7e /indra/llcommon/llsdserialize.cpp | |
parent | 1a4517e5af8f43433fc2547658615dce4073d9a3 (diff) | |
parent | 78174fc8658caeddfd8306ec19eb0e1c2975368e (diff) |
Merge tag '7.1.5-release'
source for viewer 7.1.5.8443591509
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
-rw-r--r-- | indra/llcommon/llsdserialize.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index a475be6293..76171f2dfd 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -2174,7 +2174,7 @@ std::string zip_llsd(LLSD& data) U8 out[CHUNK]; - strm.avail_in = narrow(source.size()); + strm.avail_in = narrow<size_t>(source.size()); strm.next_in = (U8*) source.data(); U8* output = NULL; |