diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-09-29 23:17:49 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-09-29 23:17:49 +0300 |
| commit | 332ddc67de2de245a52d9db3be20f4ba8051f166 (patch) | |
| tree | beed474fae2440a071a85f1d8b47f78376e88b04 /indra/newview/lltexturectrl.cpp | |
| parent | 9346b45188462056698083f4f83fe8fecbe19bdf (diff) | |
SL-17653 Small change in material loading order
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
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 |