diff options
author | Dave Houlton <euclid@lindenlab.com> | 2021-12-15 14:37:18 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2021-12-15 14:37:18 -0700 |
commit | cf35d27dfb86a8a8d8223bc344f35984efaa7b98 (patch) | |
tree | 883758ee1282e0936343ec27d80d25329aae9242 /indra/newview/llsettingsvo.h | |
parent | 199775b7ac214cfc3492c343c3f6046effcde7ed (diff) | |
parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) |
DRTVWR-546 merge up to 6.5.2
Diffstat (limited to 'indra/newview/llsettingsvo.h')
-rw-r--r-- | indra/newview/llsettingsvo.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llsettingsvo.h b/indra/newview/llsettingsvo.h index caa3ac18d3..05ec0e9275 100644 --- a/indra/newview/llsettingsvo.h +++ b/indra/newview/llsettingsvo.h @@ -38,7 +38,6 @@ #include "llextendedstatus.h" #include <boost/signals2.hpp> -class LLVFS; class LLInventoryItem; class LLGLSLShader; @@ -81,7 +80,7 @@ private: static void onAgentAssetUploadComplete(LLUUID itemId, LLUUID newAssetId, LLUUID newItemId, LLSD response, LLSettingsBase::ptr_t psettings, inventory_result_fn callback); static void onTaskAssetUploadComplete(LLUUID itemId, LLUUID taskId, LLUUID newAssetId, LLSD response, LLSettingsBase::ptr_t psettings, inventory_result_fn callback); - static void onAssetDownloadComplete(LLVFS *vfs, const LLUUID &asset_id, S32 status, LLExtStat ext_status, asset_download_fn callback); + static void onAssetDownloadComplete(const LLUUID &asset_id, S32 status, LLExtStat ext_status, asset_download_fn callback); }; //========================================================================= |