summaryrefslogtreecommitdiff
path: root/indra/llmessage/llassetstorage.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-08-11 15:36:09 -0400
committerOz Linden <oz@lindenlab.com>2016-08-11 15:36:09 -0400
commit6ff420d705625fef4b0456c19bb9c766cabb31af (patch)
tree16c27571df04932dd830b35e06cdf4e9b5dbf07e /indra/llmessage/llassetstorage.h
parentc32b27f5b77c7d8e53b11163d04f2842949d71de (diff)
parent4fb100ac7a33174883184f1320d0beac08ead3a7 (diff)
merge changes for 4.0.7-release
Diffstat (limited to 'indra/llmessage/llassetstorage.h')
-rw-r--r--indra/llmessage/llassetstorage.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llmessage/llassetstorage.h b/indra/llmessage/llassetstorage.h
index 4be677a4b0..0f23754096 100644
--- a/indra/llmessage/llassetstorage.h
+++ b/indra/llmessage/llassetstorage.h
@@ -181,6 +181,10 @@ protected:
// Map of known bad assets
typedef std::map<LLUUID,U64,lluuid_less> toxic_asset_map_t;
+// *TODO: these typedefs are passed into the VFS via a legacy C function pointer
+// future project would be to convert these to C++ callables (std::function<>) so that
+// we can use bind and remove the userData parameter.
+//
typedef void (*LLGetAssetCallback)(LLVFS *vfs, const LLUUID &asset_id,
LLAssetType::EType asset_type, void *user_data, S32 status, LLExtStat ext_status);