diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:45:08 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-04 16:45:08 -0500 |
| commit | 78895f9e0c628dc33268578faf135e967cf30142 (patch) | |
| tree | 6bca9250bf59591dce7636de42efe3cf293a232f /indra/llmessage/llassetstorage.cpp | |
| parent | 09c7d38166e3f5d04ed6321b2ac06c4112bb858b (diff) | |
| parent | 562ed9c4d463ccb96dd4e6b23dff6ad6c845fc96 (diff) | |
merge changes for storm-467
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, |