SL-18008 Updated Save and Edit PBR buttons

1 files changed, 7 insertions, 16 deletions

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 457ff525c5..f4b75c9154 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -4580,24 +4580,15 @@ void LLPanelFace::onPbrSelectionChanged(LLInventoryItem* itemp)
     }
 }
 
-void LLPanelFace::onPbrStartEditing() {
-    LL_DEBUGS() << "begin live editing material" << LL_ENDL;
-
-    LLMaterialEditor *editor =
-        dynamic_cast<LLMaterialEditor *>(LLFloaterReg::showInstance("material_editor", LLSD(LLUUID::null), TAKE_FOCUS_YES));
-    if (editor)
-    {
-        bool   identical;
-        LLUUID material_id;
-        LLSelectedTE::getPbrMaterialId(material_id, identical);
+void LLPanelFace::onPbrStartEditing()
+{
+    bool   identical;
+    LLUUID material_id;
+    LLSelectedTE::getPbrMaterialId(material_id, identical);
 
-        LL_DEBUGS() << "loading material live editor with asset " << material_id << LL_ENDL;
+    LL_DEBUGS() << "loading material live editor with asset " << material_id << LL_ENDL;
 
-        LLPointer<LLGLTFMaterial> material = gGLTFMaterialList.getMaterial(material_id);
-        editor->setTitle(editor->getString("material_override_title"));
-        editor->setAssetId(material_id);
-        editor->setFromGLTFMaterial(material);
-    }
+    LLMaterialEditor::loadLiveMaterial(material_id);
 }
 
 bool LLPanelFace::isIdenticalPlanarTexgen()