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

SL-17547 Fix for crash on shutdown introduced in last commit.

meow-7.2.2
Dave Parks 2022-06-07 15:24:40 -05:00
parent 197baebc62
commit 99189ff2d5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/lltexturefetch.cpp
View File

@ -3011,7 +3011,7 @@ bool LLTextureFetch::getRequestFinished(const LLUUID& id, S32& discard_level,
bool LLTextureFetch::updateRequestPriority(const LLUUID& id, F32 priority)
{
LL_PROFILE_ZONE_SCOPED;
mRequestQueue.post([=]()
mRequestQueue.tryPost([=]()
{
LLTextureFetchWorker* worker = getWorker(id);
if (worker)

5
indra/newview/llviewertexture.cpp
View File

@ -653,7 +653,10 @@ void LLViewerTexture::cleanup()
{
notifyAboutMissingAsset();
LLAppViewer::getTextureFetch()->updateRequestPriority(mID, 0.f);
if (LLAppViewer::getTextureFetch())
{
LLAppViewer::getTextureFetch()->updateRequestPriority(mID, 0.f);
}
mFaceList[LLRender::DIFFUSE_MAP].clear();
mFaceList[LLRender::NORMAL_MAP].clear();