diff options
| author | simon <none@none> | 2014-12-08 11:49:59 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-12-08 11:49:59 -0800 |
| commit | ffb510a4522d91e387d26a674b0cc9ff732c44b8 (patch) | |
| tree | dea8b6448f284ac411f9e2cb6411cb964723dbdb /indra/newview/llflickrconnect.cpp | |
| parent | 4f076daeff1bb626bb90a57cbe91660349ec62f1 (diff) | |
| parent | 7e962d3798994631e0fa0b7d27726c604f4c604c (diff) | |
Merge downstream code and become version 3.7.23
Diffstat (limited to 'indra/newview/llflickrconnect.cpp')
| -rw-r--r-- | indra/newview/llflickrconnect.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llflickrconnect.cpp b/indra/newview/llflickrconnect.cpp index b715896264..b75660ea00 100644 --- a/indra/newview/llflickrconnect.cpp +++ b/indra/newview/llflickrconnect.cpp @@ -400,7 +400,7 @@ void LLFlickrConnect::uploadPhoto(LLPointer<LLImageFormatted> image, const std:: } else { - llwarns << "Image to upload is not a PNG or JPEG" << llendl; + LL_WARNS() << "Image to upload is not a PNG or JPEG" << LL_ENDL; return; } |