summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r--indra/newview/llviewermenu.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 5cb63426a8..47b355e554 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2970,7 +2970,7 @@ void load_life_gltf_material(bool copy)
}
else
{
- LLMaterialEditor::loadLiveMaterial(mat_id);
+ LLMaterialEditor::loadLiveMaterialEditor();
}
LLViewerJoystick::getInstance()->moveObjects(true);
@@ -2979,7 +2979,8 @@ void load_life_gltf_material(bool copy)
void handle_object_edit_gltf_material()
{
- load_life_gltf_material(false);
+ handle_object_edit();
+ LLMaterialEditor::loadLiveMaterialEditor();
}
void handle_object_save_gltf_material()