diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 22:00:08 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 22:00:08 +0200 |
| commit | 19ff86fabd84ba45bbbdfd1fa5393fb9ab89dddf (patch) | |
| tree | 4160038613ed7efe5c806bdb11379ea453e48900 /indra/newview/llpreviewnotecard.h | |
| parent | be83a004db5831958837d9caa3bf7c98fedc3bf2 (diff) | |
| parent | 88d837c16e768c5262073a7df965066d4bd8842c (diff) | |
Merge branch 'master' into DRTVWR-522-maint
Diffstat (limited to 'indra/newview/llpreviewnotecard.h')
| -rw-r--r-- | indra/newview/llpreviewnotecard.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpreviewnotecard.h b/indra/newview/llpreviewnotecard.h index 063a01ca47..d9c14815c1 100644 --- a/indra/newview/llpreviewnotecard.h +++ b/indra/newview/llpreviewnotecard.h @@ -83,7 +83,8 @@ protected: void deleteNotecard(); - static void onLoadComplete(const LLUUID& asset_uuid, + static void onLoadComplete(LLVFS *vfs, + const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status); |