SL-18105 Add mechanism for applying overrides that were received before associated ViewerObject was ready to receive them.

1 files changed, 11 insertions, 0 deletions

diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp
index 68de480d87..d810c6ed25 100644
--- a/indra/llprimitive/lltextureentry.cpp
+++ b/indra/llprimitive/lltextureentry.cpp
@@ -519,6 +519,17 @@ void LLTextureEntry::setGLTFMaterial(LLGLTFMaterial* material)
     }
 }
 
+LLGLTFMaterial* LLTextureEntry::getGLTFRenderMaterial() const
+{ 
+    if (mGLTFRenderMaterial.notNull())
+    {
+        return mGLTFRenderMaterial;
+    }
+    
+    llassert(getGLTFMaterialOverride() == nullptr);
+    return getGLTFMaterial();
+}
+
 S32 LLTextureEntry::setGLTFRenderMaterial(LLGLTFMaterial* mat)
 {
     if (mGLTFRenderMaterial != mat)