From 332ddc67de2de245a52d9db3be20f4ba8051f166 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 29 Sep 2022 23:17:49 +0300
Subject: SL-17653 Small change in material loading order

---
 indra/newview/lltexturectrl.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'indra/newview/lltexturectrl.cpp')

diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index ff0d74a7c9..5d9eb48e6c 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -970,12 +970,7 @@ void LLFloaterTexturePicker::onBtnUpload(void* userdata)
         LLLocalGLTFMaterialMgr::getInstance()->getFilenameAndIndex(tracking_id, filename, index);
         if (!filename.empty())
         {
-            LLMaterialEditor* me = (LLMaterialEditor*)LLFloaterReg::getInstance("material_editor");
-            if (me)
-            {
-                me->loadMaterialFromFile(filename, index);
-                me->setFocus(TRUE);
-            }
+            LLMaterialEditor::loadMaterialFromFile(filename, index);
         }
     }
     else
-- 
cgit v1.2.3