diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-06-11 10:21:19 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-06-11 10:21:19 -0400 |
| commit | 30f4163b7b576d96533b61d9b31243960fb83f2e (patch) | |
| tree | bd5dc1450e08c674a4619d7f16a9a4816005f9c4 /indra/llprimitive/lltextureentry.cpp | |
| parent | 3d1aac4f5c369e9d402c41f1c790d9015f7c7773 (diff) | |
| parent | f5e2708a0fc4e08d3d0a5dc393bbd4bac09e1c55 (diff) | |
Merge branch 'main' of github.com:secondlife/viewer into lua-bradfix
to pick up Featurettes promotion + Brad's GitHub Windows build workaround.
Diffstat (limited to 'indra/llprimitive/lltextureentry.cpp')
| -rw-r--r-- | indra/llprimitive/lltextureentry.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp index 684660e24a..2ed8f8c044 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; } |