summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2022-10-22 15:25:03 -0500
committerDave Parks <davep@lindenlab.com>2022-10-22 15:25:03 -0500
commit88659e9fe793a02fb4edcbf8ef07307c25119604 (patch)
tree101a4f72c45ce3bce4bde6b3a391d32e69ccf70a /indra/newview/llviewermenu.cpp
parent7135934e50bf2727c2366687af7427d44483e984 (diff)
SL-18105 When saving an object's material to inventory, save the version that as overrides applied.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r--indra/newview/llviewermenu.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 47b355e554..18d215f9f4 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2970,7 +2970,7 @@ void load_life_gltf_material(bool copy)
}
else
{
- LLMaterialEditor::loadLiveMaterialEditor();
+ LLMaterialEditor::loadLive();
}
LLViewerJoystick::getInstance()->moveObjects(true);
@@ -2980,12 +2980,12 @@ void load_life_gltf_material(bool copy)
void handle_object_edit_gltf_material()
{
handle_object_edit();
- LLMaterialEditor::loadLiveMaterialEditor();
+ LLMaterialEditor::loadLive();
}
void handle_object_save_gltf_material()
{
- load_life_gltf_material(true);
+ LLMaterialEditor::loadObjectSave();
}
void handle_attachment_edit(const LLUUID& inv_item_id)