diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2022-07-14 19:10:23 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2022-07-14 19:10:23 -0700 |
| commit | 015cebd2a4d29dba883e06fe93065bee98f7f9c9 (patch) | |
| tree | 2531a67ad98078c832fa79fd43bc807095030318 /indra/newview/llmaterialeditor.h | |
| parent | d05ccd74d44b595d02d6032c9ed2c0f9ff21f5f0 (diff) | |
| parent | 075049d02c6e86eaf25cbe67556207247627a5e8 (diff) | |
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llmaterialeditor.h')
| -rw-r--r-- | indra/newview/llmaterialeditor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmaterialeditor.h b/indra/newview/llmaterialeditor.h index dd0a17976c..6196e3d310 100644 --- a/indra/newview/llmaterialeditor.h +++ b/indra/newview/llmaterialeditor.h @@ -57,7 +57,7 @@ public: void setFromGLTFMaterial(LLGLTFMaterial* mat); - void loadAsset(); + void loadAsset() override; static void onLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status); |