diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-02 07:07:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-02 07:07:49 -0400 |
| commit | e58c809a5816383674d0f1957440fad728e88893 (patch) | |
| tree | 83f1ff2c4bee8237c4557793143b2133623943a4 /indra/llmessage/llassetstorage.cpp | |
| parent | f9af1f4fca028709b0262c0e8c40eefc2ab13d00 (diff) | |
| parent | e6c0615b97019cf9c8aee267513757c0c2510420 (diff) | |
merge changes for STORM-1131
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, |