diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-05-14 17:50:59 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-05-14 17:50:59 -0400 |
| commit | 487ca1bad37883be0325b564ab557a8f77575388 (patch) | |
| tree | a8e7c6163d18f41161f5477c8af31207d2b4eae2 /indra/newview/llassetuploadresponders.cpp | |
| parent | 7b9708a2e3aede6faef04bd546c497dc68264f58 (diff) | |
v-r -> s-e merge WIP
Diffstat (limited to 'indra/newview/llassetuploadresponders.cpp')
| -rwxr-xr-x | indra/newview/llassetuploadresponders.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index e92c897ad8..a98ff64d0a 100755 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -297,7 +297,7 @@ void LLAssetUploadResponder::uploadUpload(const LLSD& content) void LLAssetUploadResponder::uploadFailure(const LLSD& content) { - llwarns << dumpResponse() << llendl; + LL_WARNS() << dumpResponse() << LL_ENDL; // remove the "Uploading..." message LLUploadDialog::modalUploadFinished(); LLFloater* floater_snapshot = LLFloaterReg::findInstance("snapshot"); |