diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-11 08:37:03 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-11 08:37:43 +0300 |
| commit | 534605eb228c8b9ab9df0137394f3f55b7f7b022 (patch) | |
| tree | caed3347d6780d73ac2b66296552fedc0a9f7938 /indra/llprimitive/lltextureentry.cpp | |
| parent | d1cf13f31e75807500aff0cf49812a76aff2bd74 (diff) | |
| parent | a73773bc1abdac6bc3beea36fd4ba58eba686e13 (diff) | |
Merge branch 'main' (featurette) into inventory_favorites
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; } |