summaryrefslogtreecommitdiff
path: root/indra/llmessage
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-24 09:07:06 -0500
committerOz Linden <oz@lindenlab.com>2010-12-24 09:07:06 -0500
commitef1c3aac889d118530994e878d83426d4fc2ca7c (patch)
treedd3d1240a8f5e9b7f1a60d7447b9aa3d624ada88 /indra/llmessage
parentf421e8701b3ef5b0230b06602fc5e937382ccc68 (diff)
parent14d830ca43a7114140ebeb16a76829db4d21a95b (diff)
merge fix for storm-784
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,