diff options
| author | Callum Prentice <callum@lindenlab.com> | 2025-10-22 19:16:59 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2025-10-22 19:16:59 -0700 |
| commit | 21e9b38f06e187414d30c12c8c69ebf7b4e4e636 (patch) | |
| tree | d41d6b2db8a878cc18f2215e01fd710fb663a76e /indra/newview/llselectmgr.cpp | |
| parent | c64c16a59ae2220b29ba0ed1f3f22da07e694612 (diff) | |
| parent | 0da96a508a5d8d384e017f707babd2193f6ca6a7 (diff) | |
Merge branch 'develop' of https://github.com/secondlife/viewer into callum/voice-moderation-2
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index be4b449e2a..4762fc555d 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -2073,7 +2073,6 @@ bool LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id) objectp->clearTEWaterExclusion(te); // Blank out most override data on the object and send to server - objectp->setRenderMaterialID(te, asset_id); if (should_preserve_transforms && preserved_override) { // Apply material with preserved transforms |