From 3a03c5f8fe00ae23a33c823625052f39fb42501e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 1 Apr 2025 16:30:21 +0300
Subject: #3846 Crash at updateGLTFMaterials

---
 indra/newview/lllocalbitmaps.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp
index 75c77e9301..e31fbb188a 100644
--- a/indra/newview/lllocalbitmaps.cpp
+++ b/indra/newview/lllocalbitmaps.cpp
@@ -700,11 +700,15 @@ void LLLocalBitmap::updateGLTFMaterials(LLUUID old_id, LLUUID new_id)
             // do not create a new material, reuse existing pointer
             // so that mTextureEntires remains untouched
             LLGLTFMaterial* render_mat = entry->getGLTFRenderMaterial();
-            if (render_mat)
+            if (render_mat && render_mat != mat)
             {
                 *render_mat = *mat;
                 render_mat->applyOverride(*override_mat); // can update mGLTFMaterialWithLocalTextures
             }
+            else
+            {
+                LL_WARNS() << "A TE had an override, but no render material" << LL_ENDL;
+            }
         }
     }
 }
-- 
cgit v1.2.3