From cf3a0c77f1855aa1a33ff39f86e846e7fb9031d1 Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Thu, 23 Mar 2023 16:51:30 -0700
Subject: Fix for SL-18458 overrides not applying when cache load happened
 before LLViewerObject::updateTEMaterialTextures call

---
 indra/newview/llgltfmateriallist.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llgltfmateriallist.cpp')

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);
 
-- 
cgit v1.2.3