summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerassetstorage.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-02-26 09:27:14 -0800
committerRider Linden <rider@lindenlab.com>2018-02-26 09:27:14 -0800
commitb766466b3013e39831bcfcaef5d1089c07202afb (patch)
tree8d60793bc706efe39407cbec0a2c6c16b3bcec51 /indra/newview/llviewerassetstorage.h
parente9edd37cdb39639e1ab24e2e63d4f83432282c88 (diff)
Added settings inventory object with subtype
Diffstat (limited to 'indra/newview/llviewerassetstorage.h')
-rw-r--r--indra/newview/llviewerassetstorage.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h
index 50131682e7..cefe215431 100644
--- a/indra/newview/llviewerassetstorage.h
+++ b/indra/newview/llviewerassetstorage.h
@@ -69,14 +69,14 @@ protected:
// virtual
void _queueDataRequest(const LLUUID& uuid,
LLAssetType::EType type,
- void (*callback) (LLVFS *vfs, const LLUUID&, LLAssetType::EType, void *, S32, LLExtStat),
+ LLGetAssetCallback callback,
void *user_data,
BOOL duplicate,
BOOL is_priority);
void queueRequestHttp(const LLUUID& uuid,
LLAssetType::EType type,
- void (*callback) (LLVFS *vfs, const LLUUID&, LLAssetType::EType, void *, S32, LLExtStat),
+ LLGetAssetCallback callback,
void *user_data,
BOOL duplicate,
BOOL is_priority);
@@ -86,7 +86,7 @@ protected:
void assetRequestCoro(LLViewerAssetRequest *req,
const LLUUID uuid,
LLAssetType::EType atype,
- void (*callback) (LLVFS *vfs, const LLUUID&, LLAssetType::EType, void *, S32, LLExtStat),
+ LLGetAssetCallback callback,
void *user_data);
std::string getAssetURL(const std::string& cap_url, const LLUUID& uuid, LLAssetType::EType atype);