diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-03-09 14:39:51 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-03-09 14:39:51 -0800 |
| commit | 168d177197bd7558bbe0ca13d01c984ad8638da7 (patch) | |
| tree | 60b01576041b1d1e336fef9c4944570c2c4dfcc4 /indra/newview/llpreviewnotecard.h | |
| parent | 519cbcecdf78e4dfc3adc465ae8cebed5df71647 (diff) | |
This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
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); |