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

SL-18458 VOCache cleanup region_handle message encoding. 

Really wish there were a native way to send S64/U64 values in llsd.
meow-7.2.2
Brad Kittenbrink 2022-11-15 12:51:28 -08:00
parent 3cc3e6a5e0
commit 911aba0c1c
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/llgltfmateriallist.cpp
View File

@ -693,20 +693,13 @@ void LLGLTFMaterialList::writeCacheOverrides(LLSD const & message, std::string c
// default to main region if message doesn't specify
LLViewerRegion * region = gAgent.getRegion();;
if (message.has("region_handle"))
if (message.has("region_handle_low") && message.has("region_handle_high"))
{
// TODO start requiring this once server sends this for all messages
std::vector<U8> const & buffer = message["region_handle"].asBinary();
if (buffer.size() == sizeof(U64))
{
U64 region_handle = ntohll(*reinterpret_cast<U64 const *>(&buffer[0]));
region = LLWorld::instance().getRegionFromHandle(region_handle);
}
else
{
LL_WARNS() << "bad region_handle in material override message" << LL_ENDL;
llassert(false);
}
U64 region_handle_low = message["region_handle_low"].asInteger();
U64 region_handle_high = message["region_handle_high"].asInteger();
U64 region_handle = (region_handle_low & 0x00000000ffffffffUL) || (region_handle_high << 32);
region = LLWorld::instance().getRegionFromHandle(region_handle);
}
if (region) {