diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-01 13:45:21 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-01 13:45:21 +0100 |
| commit | bb4836f53d98d987a1702f970d4b853eaa529907 (patch) | |
| tree | c0d16c64f89f10cd383cbbefa1cf2a914d0dc22a /indra/llmessage/llassetstorage.cpp | |
| parent | a503cb57465594bf693ed335d04715389725b3b0 (diff) | |
| parent | 68870a1f59c11a173353698b994f4540b214d57f (diff) | |
another hairy merge from viewer-trunk
Diffstat (limited to 'indra/llmessage/llassetstorage.cpp')
| -rw-r--r-- | indra/llmessage/llassetstorage.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp index 047b99c861..e7527b1e78 100644 --- a/indra/llmessage/llassetstorage.cpp +++ b/indra/llmessage/llassetstorage.cpp @@ -408,6 +408,8 @@ void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, vo { lldebugs << "LLAssetStorage::getAssetData() - " << uuid << "," << LLAssetType::lookup(type) << llendl; + llinfos << "ASSET_TRACE requesting " << uuid << " type " << LLAssetType::lookup(type) << llendl; + if (mShutDown) { return; // don't get the asset or do any callbacks, we are shutting down @@ -471,6 +473,8 @@ void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, vo // we've already got the file // theoretically, partial files w/o a pending request shouldn't happen // unless there's a weird error + llinfos << "ASSET_TRACE asset " << uuid << " found in VFS" << llendl; + if (callback) { callback(mVFS, uuid, type, user_data, LL_ERR_NOERR, LL_EXSTAT_VFS_CACHED); @@ -528,6 +532,8 @@ void LLAssetStorage::downloadCompleteCallback( LLAssetType::EType file_type, void* user_data, LLExtStat ext_status) { + llinfos << "ASSET_TRACE asset " << file_id << " downloadCompleteCallback" << llendl; + lldebugs << "LLAssetStorage::downloadCompleteCallback() for " << file_id << "," << LLAssetType::lookup(file_type) << llendl; LLAssetRequest* req = (LLAssetRequest*)user_data; |