summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2010-12-22 14:24:28 -0800
committerDon Kjer <don@lindenlab.com>2010-12-22 14:24:28 -0800
commit0f5d8e53cad9afe4f5601c6a6cdd82ec474935e5 (patch)
tree25333fe8d8ba1c19b176d7feade03ccecfdd5829 /indra/llmessage
parent649dd6eb74023d48379ebaadd2ff000801306f17 (diff)
parentc86d6a7bbb7c0db7665b76cf52b12b90c6e98c6d (diff)
Merge with viewer-development
Diffstat (limited to 'indra/llmessage')
-rw-r--r--indra/llmessage/llassetstorage.cpp4
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,