diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-28 17:07:57 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-28 17:07:57 -0500 |
| commit | ee227feed38d157cf42df1987555f0188888fc62 (patch) | |
| tree | 12242822a149c8d878d2a86f6c018365599a6ebe /indra/newview/llmaterialeditor.cpp | |
| parent | 3b08abf70b69f4905dae550d766eaf7de4983be7 (diff) | |
| parent | c61224bef22686c4e6f5b4a6af9acbeb27d561ab (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
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(), |