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

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h
index 8dc3434a01..e37bc9a3b6 100644
--- a/indra/llprimitive/lltextureentry.h
+++ b/indra/llprimitive/lltextureentry.h
@@ -199,12 +199,12 @@ public:
     LLGLTFMaterial* getGLTFMaterial() const { return mGLTFMaterial; }
 
     // GLTF override
-    LLGLTFMaterial* getGLTFMaterialOverride() { return mGLTFMaterialOverrides; }
+    LLGLTFMaterial* getGLTFMaterialOverride() const { return mGLTFMaterialOverrides; }
     void setGLTFMaterialOverride(LLGLTFMaterial* mat) { mGLTFMaterialOverrides = mat; }
 
     // GLTF render material
     // nuanced behavior here -- if there is no render material, fall back to getGLTFMaterial, but ONLY for the getter, not the setter
-    LLGLTFMaterial* getGLTFRenderMaterial() const { return mGLTFRenderMaterial.notNull() ? mGLTFRenderMaterial.get() : getGLTFMaterial(); }
+    LLGLTFMaterial* getGLTFRenderMaterial() const;
     S32 setGLTFRenderMaterial(LLGLTFMaterial* mat);
 
 public: