summaryrefslogtreecommitdiff
path: root/indra/llprimitive/lltextureentry.cpp
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@lindenlab.com>2024-01-24 22:05:26 -0800
committerGitHub <noreply@github.com>2024-01-24 22:05:26 -0800
commit85bf567010d54b64b3144397bff7c3c0448d85da (patch)
tree587cb9570386e50ea009112dba5c9ea0d56ffa51 /indra/llprimitive/lltextureentry.cpp
parentc22aefafb3d05be37965361913c02568fa10adf6 (diff)
parent2510134f40c2edd2eea40f486f094517b8ffaa51 (diff)
Merge pull request #669 from secondlife/DRTVWR-583
Put mirrors behind a feature flag and merge to materials_featurette
Diffstat (limited to 'indra/llprimitive/lltextureentry.cpp')
-rw-r--r--indra/llprimitive/lltextureentry.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp
index 71caff1686..ee2a4c769a 100644
--- a/indra/llprimitive/lltextureentry.cpp
+++ b/indra/llprimitive/lltextureentry.cpp
@@ -685,6 +685,7 @@ S32 LLTextureEntry::setMaterialParams(const LLMaterialPtr pMaterialParams)
mMaterialUpdatePending = true;
}
mMaterial = pMaterialParams;
+
return TEM_CHANGE_TEXTURE;
}