diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-26 16:08:28 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-26 16:08:28 -0500 |
| commit | 8f47657d646c06dbba8d44497c0f81fd00730cc8 (patch) | |
| tree | eec5702e7dc4d83a8bf00c0c7a87272870fcec42 /indra/llprimitive/lltextureentry.h | |
| parent | ed1e5214cefc5f0aeb630bf2fbcda9dff9ed8d61 (diff) | |
SL-18443 Allow nulling out of override data and implement new override message protocol.
Diffstat (limited to 'indra/llprimitive/lltextureentry.h')
| -rw-r--r-- | indra/llprimitive/lltextureentry.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/lltextureentry.h b/indra/llprimitive/lltextureentry.h index e37bc9a3b6..d94e14bd73 100644 --- a/indra/llprimitive/lltextureentry.h +++ b/indra/llprimitive/lltextureentry.h @@ -200,7 +200,7 @@ public: // GLTF override LLGLTFMaterial* getGLTFMaterialOverride() const { return mGLTFMaterialOverrides; } - void setGLTFMaterialOverride(LLGLTFMaterial* mat) { mGLTFMaterialOverrides = mat; } + void setGLTFMaterialOverride(LLGLTFMaterial* 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 |