diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-04-16 11:32:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-16 11:32:57 -0700 |
| commit | d46811d60d8fca4a9908b4e989b14905345928bd (patch) | |
| tree | 17ad4d20832d8c788537bd17e0ece862a16031e6 /indra/newview/llgltfmateriallist.cpp | |
| parent | bed05f53ae64a9b24ab2906a732929098761ffa3 (diff) | |
| parent | ee33a43daee924d32bf5de58c264a6d384ef7451 (diff) | |
Merge pull request #1230 from beqjanus/StopVoCacheTPHangs
Stop vo cache related tp hangs
Diffstat (limited to 'indra/newview/llgltfmateriallist.cpp')
| -rw-r--r-- | indra/newview/llgltfmateriallist.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp index f07ea7ee4f..e97eb552cf 100644 --- a/indra/newview/llgltfmateriallist.cpp +++ b/indra/newview/llgltfmateriallist.cpp @@ -244,7 +244,12 @@ void LLGLTFMaterialList::applyOverrideMessage(LLMessageSystem* msg, const std::s } } - region->cacheFullUpdateGLTFOverride(cache); + // Workaround for server sending empty overrides. + if(cache.mSides.size() > 0) + { + region->cacheFullUpdateGLTFOverride(cache); + LL_DEBUGS("GLTF") << "GLTF Material Override: " << cache.mObjectId << " " << cache.mLocalId << " " << cache.mRegionHandle << " (sides:" << (cache.mSides.size()) << ")" << LL_ENDL; + } } } |