diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:40:53 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-02 21:40:53 +0200 |
| commit | 4f55a14f8281e7cccfa5c6980ad77921cb5ebdd8 (patch) | |
| tree | 4488f5a79272efeb2074362240f9958352def0ec /indra/newview/llpreviewgesture.h | |
| parent | e84d726e10c9051449f701cc9e93d63bf50413ac (diff) | |
| parent | 2b385841f3031d599bdb226f0f859e51b09870f8 (diff) | |
Merge branch 'master' into DRTVWR-483
Diffstat (limited to 'indra/newview/llpreviewgesture.h')
| -rw-r--r-- | indra/newview/llpreviewgesture.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llpreviewgesture.h b/indra/newview/llpreviewgesture.h index 3ba4f56295..19bccf35bd 100644 --- a/indra/newview/llpreviewgesture.h +++ b/indra/newview/llpreviewgesture.h @@ -39,7 +39,6 @@ class LLScrollListCtrl; class LLScrollListItem; class LLButton; class LLRadioGroup; -class LLVFS; class LLPreviewGesture : public LLPreview { @@ -80,8 +79,7 @@ protected: void loadAsset(); - 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); |