From 88659e9fe793a02fb4edcbf8ef07307c25119604 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Sat, 22 Oct 2022 15:25:03 -0500
Subject: SL-18105 When saving an object's material to inventory, save the
 version that as overrides applied.

---
 indra/newview/llviewerobject.cpp | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index eaf0287dae..603dcc4fa7 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -5333,6 +5333,9 @@ S32 LLViewerObject::setTEGLTFMaterialOverride(U8 te, LLGLTFMaterial* override_ma
 
     tep->setGLTFMaterialOverride(override_mat);
 
+    // if override mat exists, we must also have a source mat
+    llassert(override_mat ? src_mat : true);
+
     if (override_mat && src_mat)
     {
         LLFetchedGLTFMaterial* render_mat = new LLFetchedGLTFMaterial(*src_mat);
-- 
cgit v1.2.3