summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorAndrey Lihatskiy <andreylproductengine@lindenlab.com>2016-06-13 20:53:47 +0300
committerAndrey Lihatskiy <andreylproductengine@lindenlab.com>2016-06-13 20:53:47 +0300
commitd1d39c1dd4bb3454f21a97083575853fd0ca237c (patch)
treef094124d935030bc27d5c5ffd7aa8f5976ad6dfe /indra/llmessage
parent1adfaa081fd27d653619c84c520c16516c530ab1 (diff)
parenta3c4d1cd207358318ce5c91108f9bfcb14fecac6 (diff)
Merged in rider_linden/viewer-lynx (pull request #26)
Diffstat (limited to 'indra/llmessage')
-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);