livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'DRTVWR-489-emoji-PR' of https://github.com/secondlife/viewer 

# Conflicts:
#	autobuild.xml
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/newview/llmeshrepository.cpp
master
Ansariel 2023-03-21 12:21:56 +01:00
parent ba2477b07d b2d064a561
commit b6e9dcc4e8
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
autobuild.xml
View File

@ -1188,9 +1188,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>4390c5182b5d6c397ef0396828093600</string>
<string>9cbcd452efa877fb8550c8c9b092b465</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106585/931193/freetype-2.12.1.576132-darwin64-576132.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/111566/967515/freetype-2.12.1.578664-darwin64-578664.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -1212,9 +1212,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>6ad01c23db703cd6ad2a491aae937379</string>
<string>f3d7b72d10c162c9a8aa2ac4443ac52f</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106586/931203/freetype-2.12.1.576132-windows-576132.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/111571/967545/freetype-2.12.1.578664-windows-578664.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -1224,16 +1224,16 @@
<key>archive</key>
<map>
<key>hash</key>
<string>db5f433b65a268a1ea601d7e29766cb1</string>
<string>96d3689043e939ae424060a8b498be1f</string>
<key>url</key>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/106587/931202/freetype-2.12.1.576132-windows64-576132.tar.bz2</string>
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/111570/967535/freetype-2.12.1.578664-windows64-578664.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>2.12.1.576132</string>
<string>2.12.1.578664</string>
</map>
<key>glext</key>
<map>

4
indra/llcommon/llsdserialize.cpp
View File

@ -2298,7 +2298,7 @@ LLUZipHelper::EZipRresult LLUZipHelper::unzip_llsd(LLSD& data, const U8* in, S32
//This unzip function will only work with a gzip header and trailer - while the contents
//of the actual compressed data is the same for either format (gzip vs zlib ), the headers
//and trailers are different for the formats.
U8* unzip_llsdNavMesh(bool& valid, unsigned int& outsize, std::istream& is, S32 size)
U8* unzip_llsdNavMesh(bool& valid, size_t& outsize, std::istream& is, S32 size)
{
// <FS:Beq pp Rye> Add non-allocating variants of unzip_llsd
// if (size == 0)
@ -2434,7 +2434,7 @@ U8* unzip_llsdNavMesh(bool& valid, unsigned int& outsize, std::istream& is, S32
return unzip_llsdNavMesh(valid, outsize, in.get(), size);
}
U8* unzip_llsdNavMesh(bool& valid, unsigned int& outsize, const U8* in, S32 size)
U8* unzip_llsdNavMesh(bool& valid, size_t& outsize, const U8* in, S32 size)
{
if (size == 0)
{

2
indra/llcommon/llsdserialize.h
View File

@ -872,7 +872,7 @@ 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);
// <FS:Beq pp Rye> Add non-allocating variants of unzip_llsd
LL_COMMON_API U8* unzip_llsdNavMesh(bool& valid, unsigned int& outsize, const U8* in, S32 size);
LL_COMMON_API U8* unzip_llsdNavMesh(bool& valid, size_t& outsize, const U8* in, 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, llssize* header_size = nullptr);

6
indra/newview/llmeshrepository.cpp
View File

@ -1971,11 +1971,9 @@ EMeshProcessingResult LLMeshRepoThread::headerReceived(const LLVolumeParams& mes
if (data_size > 0)
{
llssize dsize = data_size;
llssize header_size_tmp{};
char* result_ptr = strip_deprecated_header((char*)data, dsize, &header_size_tmp);
header_size = static_cast<U32>(header_size_tmp);
char* result_ptr = strip_deprecated_header((char*)data, dsize, &header_size);
data_size = static_cast<S32>(dsize);
data_size = dsize;
boost::iostreams::stream<boost::iostreams::array_source> stream(result_ptr, data_size);