diff options
author | Rider Linden <rider@lindenlab.com> | 2016-06-13 09:23:20 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2016-06-13 09:23:20 -0700 |
commit | a3c4d1cd207358318ce5c91108f9bfcb14fecac6 (patch) | |
tree | 65cfb243a6458ee41572ef8899db0869ff48c43d /indra/llmessage | |
parent | 9ea13d49b7d0f9df72d23fbaf909b8bfa53b309e (diff) | |
parent | c8b662814093fa6ed592fb9cb5118a1401fdc488 (diff) |
Merge MAINT-6486
Diffstat (limited to 'indra/llmessage')
-rw-r--r-- | indra/llmessage/llassetstorage.h | 4 |
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); |