diff options
| author | Graham Linden <graham@lindenlab.com> | 2014-07-07 17:59:07 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2014-07-07 17:59:07 -0700 |
| commit | 76e7f978c157f9921593ea0e43f642cb9de4703d (patch) | |
| tree | ccc62865f26cb84cabbe9b65de23c4e1342aa142 /indra/newview/llflickrconnect.cpp | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
| parent | cf143bd4610dc279f1aa790e0b37fbad5c86f654 (diff) | |
Merge viewer up to 3.7.12, including fixing missed LL_WARNS etc from last release (is that trout you smell on the air? is it?)
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; } |