diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:42:51 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:42:51 +0200 |
| commit | be83a004db5831958837d9caa3bf7c98fedc3bf2 (patch) | |
| tree | d88b90d8d0ab8d8e85bb8224db9c3a33b3f7ffa9 /indra/newview/llpreviewnotecard.h | |
| parent | fad8c596d44190facacb9e6cc608346ce4505a3d (diff) | |
| parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (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, 1 insertions, 2 deletions
diff --git a/indra/newview/llpreviewnotecard.h b/indra/newview/llpreviewnotecard.h index d9c14815c1..063a01ca47 100644 --- a/indra/newview/llpreviewnotecard.h +++ b/indra/newview/llpreviewnotecard.h @@ -83,8 +83,7 @@ protected: void deleteNotecard(); - static void onLoadComplete(LLVFS *vfs, - const LLUUID& asset_uuid, + static void onLoadComplete(const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status); |