diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-09-13 18:41:43 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-09-13 18:41:43 -0500 |
| commit | 93389059d5490f4ed9550bc2b38d7973a4c73a18 (patch) | |
| tree | 112af7702ca68f805e11d0e7be6a61f7d83ff238 /indra/newview/llviewerobject.cpp | |
| parent | 2a5219b23f5f91a2415a51324bb5c160a0139663 (diff) | |
| parent | 2e268392a387d58ced0dc4bf7dfe5ff2ce25da1e (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index bdc47e0c50..d0bd0f45a2 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -7057,7 +7057,12 @@ void LLViewerObject::setRenderMaterialID(U8 te, const LLUUID& id) if (id.notNull()) { getTE(te)->setGLTFMaterial(gGLTFMaterialList.getMaterial(id)); - setHasRenderMaterialParams(true); + + if (!hasRenderMaterialParams()) + { + // make sure param section exists + setParameterEntryInUse(LLNetworkData::PARAMS_RENDER_MATERIAL, TRUE, false /*prevent an immediate update*/); + } } else { |