diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-12-21 10:39:35 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-12-21 10:39:35 -0500 |
commit | 4e98895719d963a72346a7bf59323cdb602f98dd (patch) | |
tree | acb409c1661b3928c58d6d70f60e52e7f5119b64 /indra/llmessage | |
parent | e0d77c277a46fa1161505a177e99b456854a98fd (diff) | |
parent | 9c97a200bebe310f91c9ab181fbe337eeab30aaa (diff) |
Automated merge up from viewer-development
Diffstat (limited to 'indra/llmessage')
-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 c5864b30c7..aada16cc9a 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, |