diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-04-01 12:28:08 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-04-01 12:28:08 +0300 |
| commit | 25976eb3da84cfa23ec6db779f830971ce8665e3 (patch) | |
| tree | 2975019de434ebe9fc4f4ffbd92d56a21b3d8bf1 /indra/llmessage/llassetstorage.cpp | |
| parent | 7f38ea147466b6d045c90d710402b2ac321dbfd9 (diff) | |
| parent | 68870a1f59c11a173353698b994f4540b214d57f (diff) | |
Merge from default branch
--HG--
branch : product-engine
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 0ab1081200..02523467e8 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; |