diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-10-28 19:58:27 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-10-28 20:08:53 +0300 |
| commit | 6d0fcc0e616ff58f4a83bc3730374c5509ee959a (patch) | |
| tree | 3ab31e4ded9fd2ec0fc7ac7c33f3b7ec7ff8fdc9 /indra/newview/llmaterialeditor.cpp | |
| parent | e72d0161bb086799d445b54e0e73c2dc13e4643a (diff) | |
SL-17699 Blank material Id for material picker
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
| -rw-r--r-- | indra/newview/llmaterialeditor.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
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(), |