diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:43:26 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:43:26 -0500 |
commit | 05810f063dbe0ed87d03ea41c7d8fdc423945c6e (patch) | |
tree | 311355a1679ef47fa1951788319e0c521a188edd /indra/llmessage/llassetstorage.cpp | |
parent | 5e376017858f6534163b0bfb6b385bdd0aeac5d3 (diff) | |
parent | e4591a85182133811e327b579c558bb3db80d79e (diff) |
merge changes for storm-737
Diffstat (limited to 'indra/llmessage/llassetstorage.cpp')
-rw-r--r-- | indra/llmessage/llassetstorage.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp index b26d412e9f..27a368df3d 100644 --- a/indra/llmessage/llassetstorage.cpp +++ b/indra/llmessage/llassetstorage.cpp @@ -513,6 +513,10 @@ void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, LL } +// +// *NOTE: Logic here is replicated in LLViewerAssetStorage::_queueDataRequest. +// Changes here may need to be replicated in the viewer's derived class. +// void LLAssetStorage::_queueDataRequest(const LLUUID& uuid, LLAssetType::EType atype, LLGetAssetCallback callback, void *user_data, BOOL duplicate, |