diff options
author | Oz Linden <oz@lindenlab.com> | 2010-12-24 09:08:20 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-12-24 09:08:20 -0500 |
commit | a9caa3151cea77b992c06c5a774d333ffd3016e1 (patch) | |
tree | 330cee487295788c500bcd7096a125120a10ae75 /indra/llmessage/llassetstorage.cpp | |
parent | bdd07a7a648dc7e2c290d5aa837c22c20c4af31c (diff) | |
parent | ef1c3aac889d118530994e878d83426d4fc2ca7c (diff) |
merge fix for storm-411
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, |