summaryrefslogtreecommitdiff
path: root/indra/newview/llgltfmateriallist.cpp
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2023-03-23 16:51:30 -0700
committerBrad Linden <brad@lindenlab.com>2023-03-23 16:54:13 -0700
commitcf3a0c77f1855aa1a33ff39f86e846e7fb9031d1 (patch)
tree2056e852b3a8923c285f8e6d2ee15e74a1071fca /indra/newview/llgltfmateriallist.cpp
parentb72c66ae688c5b5c90ea7675fc65aeefbf6b87fc (diff)
Fix for SL-18458 overrides not applying when cache load happened before LLViewerObject::updateTEMaterialTextures call
Diffstat (limited to 'indra/newview/llgltfmateriallist.cpp')
-rw-r--r--indra/newview/llgltfmateriallist.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp
index 678ec7e46b..9c78e48cab 100644
--- a/indra/newview/llgltfmateriallist.cpp
+++ b/indra/newview/llgltfmateriallist.cpp
@@ -366,6 +366,8 @@ void LLGLTFMaterialList::queueOverrideUpdate(const LLUUID& id, S32 side, LLGLTFM
void LLGLTFMaterialList::applyQueuedOverrides(LLViewerObject* obj)
{
LL_PROFILE_ZONE_SCOPED;
+
+ llassert(obj);
const LLUUID& id = obj->getID();
auto iter = mQueuedOverrides.find(id);