From 3e1afc3c917e655e8fd91a3b4b369c95a44ad981 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 11 Jan 2023 23:56:41 +0200 Subject: SL-18947 No modify materials can lock material floater Not supposed to happen, yet somehow did --- indra/newview/llmaterialeditor.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index 2e57c35326..dbbd6edb7d 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -1324,7 +1324,16 @@ bool LLMaterialEditor::updateInventoryItem(const std::string &buffer, const LLUU // done callback LLMaterialEditor::finishInventoryUpload(itemId, newAssetId, newItemId); }, - nullptr // failure callback + [](LLUUID itemId, LLUUID taskId, LLSD response, std::string reason) + { + // failure callback + LLMaterialEditor* me = LLFloaterReg::findTypedInstance("material_editor", LLSD(itemId)); + if (me) + { + me->setEnabled(true); + } + return true; + } ); url = agent_url; } -- cgit v1.2.3