summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-04 16:37:59 -0500
committerOz Linden <oz@lindenlab.com>2011-01-04 16:37:59 -0500
commit69b6aa5db2034e8e34bd234a4ebf04763419933a (patch)
tree5dd27272bed719fafb4bbb67a184cf57f0106406 /indra/llmessage
parent1a9b0523de81c9844aeaa13a3191d9881918bfa8 (diff)
parent12bc7eb0179d3154f929252c7ff95a4e8e244c0d (diff)
merge changes for storm-669
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,