summaryrefslogtreecommitdiff
path: root/indra/llmessage/llassetstorage.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-02-23 10:44:59 -0700
committerXiaohong Bao <bao@lindenlab.com>2011-02-23 10:44:59 -0700
commit01cdeb0cdd8c48b76a229d42ced4e5563cd18c5c (patch)
treee7b7ca976f17c8af3c8a2648a801030594e94c8c /indra/llmessage/llassetstorage.cpp
parent7daa3d1ca10199468946feef0ce8eb67489deee0 (diff)
parentff5e3f5c2e566f3a8e86efaa763f7b12e07eeb53 (diff)
Merge from viewer-development
Diffstat (limited to 'indra/llmessage/llassetstorage.cpp')
-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,