diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-05-04 22:46:24 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-05-04 22:46:39 +0300 |
| commit | f8f119e4a8b6d3c1f106f5e290d1da187fd9aa17 (patch) | |
| tree | 7446b67edffa7458b3a0c03784925650d2edce59 /indra/newview/llselectmgr.h | |
| parent | 7c1ccdc9a4df24e94ea7ae826446cb3ab5f36c7e (diff) | |
SL-18932 Canceling material selection only reverts override
Diffstat (limited to 'indra/newview/llselectmgr.h')
| -rw-r--r-- | indra/newview/llselectmgr.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h index 3ee78f9a58..ca9a32f0db 100644 --- a/indra/newview/llselectmgr.h +++ b/indra/newview/llselectmgr.h @@ -197,8 +197,7 @@ public: // final gltf material that users see. // Ids get applied and restored by tools floater, // overrides get applied in live material editor - void saveGLTFMaterialIds(const uuid_vec_t& materials); - void saveGLTFOverrideMaterials(const gltf_materials_vec_t& materials); + void saveGLTFMaterials(const uuid_vec_t& materials, const gltf_materials_vec_t& override_materials); BOOL allowOperationOnNode(PermissionBit op, U64 group_proxy_power) const; |