diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-26 17:22:50 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-26 17:22:50 -0500 |
| commit | 65eec2ca8fb34fb2aca8e93c8ce6d8e39cfae3e9 (patch) | |
| tree | 3e3c9812af98bc209c274fae70f9aa8eaf2c3c90 /indra/newview/llselectmgr.cpp | |
| parent | 8f47657d646c06dbba8d44497c0f81fd00730cc8 (diff) | |
| parent | 800044fb33e5e177e45e1bfa9f840a287e0bd186 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index ac508c4e8a..e4a67d7982 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -1948,18 +1948,7 @@ void LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id) objectp->setParameterEntryInUse(LLNetworkData::PARAMS_RENDER_MATERIAL, TRUE, false /*prevent an update*/); } - if (te != -1) - { - objectp->setRenderMaterialID(te, asset_id); - } - else // Shouldn't happen? - { - S32 num_faces = objectp->getNumTEs(); - for (S32 face = 0; face < num_faces; face++) - { - objectp->setRenderMaterialID(te, asset_id); - } - } + objectp->setRenderMaterialID(te, asset_id); return true; } |