From 6d0fcc0e616ff58f4a83bc3730374c5509ee959a Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 28 Oct 2022 19:58:27 +0300 Subject: SL-17699 Blank material Id for material picker --- indra/newview/llmaterialeditor.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'indra/newview/llmaterialeditor.cpp') diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index 1213deec64..533f882d39 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -2333,11 +2333,6 @@ bool LLMaterialEditor::setFromSelection() void LLMaterialEditor::loadAsset() { - // derived from LLPreviewNotecard::loadAsset - - // TODO: see commented out "editor" references and make them do something appropriate to the UI - - // request the asset. const LLInventoryItem* item; if (mNotecardInventoryID.notNull()) { @@ -2405,6 +2400,7 @@ void LLMaterialEditor::loadAsset() setEnableEditing(false); // wait for it to load + // request the asset. gAssetStorage->getInvItemAsset(source_sim, gAgent.getID(), gAgent.getSessionID(), -- cgit v1.2.3