diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-08-18 11:29:17 -0600 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-08-18 11:29:17 -0600 |
commit | 9f0da75332fcbb1bc97812baf67900702d6ced85 (patch) | |
tree | 123671904c3b349b3f557483a4a98781ce03943a /indra/newview/llsettingsvo.cpp | |
parent | 2c964e82f5ac42fbb86f551783dfb04fcdfaf460 (diff) | |
parent | e8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff) |
Merge branch 'master' 6.4.8 into DRTVWR-497
Diffstat (limited to 'indra/newview/llsettingsvo.cpp')
-rw-r--r-- | indra/newview/llsettingsvo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsettingsvo.cpp b/indra/newview/llsettingsvo.cpp index 5a4427a7b7..1e5b893cbc 100644 --- a/indra/newview/llsettingsvo.cpp +++ b/indra/newview/llsettingsvo.cpp @@ -329,7 +329,7 @@ void LLSettingsVOBase::onAssetDownloadComplete(LLVFS *vfs, const LLUUID &asset_i } else { - LL_WARNS("SETTINGS") << "Error retrieving asset " << asset_id << ". Status code=" << status << "(" << LLAssetStorage::getErrorString(status) << ") ext_status=" << ext_status << LL_ENDL; + LL_WARNS("SETTINGS") << "Error retrieving asset " << asset_id << ". Status code=" << status << "(" << LLAssetStorage::getErrorString(status) << ") ext_status=" << (U32)ext_status << LL_ENDL; } if (callback) callback(asset_id, settings, status, ext_status); |