diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-11-08 23:14:08 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-11-09 00:20:40 +0200 |
| commit | dafbed80b4cfdf906913a469503db320da49cabf (patch) | |
| tree | ffad843bc655d1d978bee03651bdd29d321a9702 /indra/newview/llselectmgr.cpp | |
| parent | d72824c2b789b81b2bc0ae2c20012ca45d23a42d (diff) | |
SL-18583 Copy&Paste support for overrides
And a fix for SL-18583
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index fa9604ef9d..ee10872a16 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -2000,10 +2000,14 @@ void LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id) { object->setHasRenderMaterialParams(false); } - else + else if (object->hasRenderMaterialParams()) { object->parameterChanged(LLNetworkData::PARAMS_RENDER_MATERIAL, true); } + else + { + object->setHasRenderMaterialParams(true); + } } if (!mItem) @@ -2262,10 +2266,14 @@ void LLSelectMgr::selectionRevertGLTFMaterials() { object->setHasRenderMaterialParams(false); } - else + else if (object->hasRenderMaterialParams()) { object->parameterChanged(LLNetworkData::PARAMS_RENDER_MATERIAL, true); } + else + { + object->setHasRenderMaterialParams(true); + } } object->sendTEUpdate(); |