summaryrefslogtreecommitdiff
path: root/indra/llprimitive
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-10-26 23:51:13 -0500
committerDave Parks <davep@lindenlab.com>2022-10-26 23:51:13 -0500
commit0e02f25604ac8518b23fcb0b466866013c90dc91 (patch)
treefd9701b8ec3aaf2c46f6ab65a6b28bd098aeb1f2 /indra/llprimitive
parentbabdb7c209b182cebaa13e2e4800b11d8036f483 (diff)
SL-18472 Fix for assert when increasing number of texture entries on existing primitive with overrides applied.
Diffstat (limited to 'indra/llprimitive')
-rw-r--r--indra/llprimitive/lltextureentry.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp
index 2803afde60..611f146a84 100644
--- a/indra/llprimitive/lltextureentry.cpp
+++ b/indra/llprimitive/lltextureentry.cpp
@@ -112,6 +112,8 @@ LLTextureEntry &LLTextureEntry::operator=(const LLTextureEntry &rhs)
mMaterialID = rhs.mMaterialID;
+ mGLTFMaterial = rhs.mGLTFMaterial;
+
if (rhs.mGLTFMaterialOverrides.notNull())
{
mGLTFMaterialOverrides = new LLGLTFMaterial(*rhs.mGLTFMaterialOverrides);