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/llimage | |
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/llimage')
-rwxr-xr-x | indra/llimage/llimagefilter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimagefilter.cpp b/indra/llimage/llimagefilter.cpp index 3d0c488768..0b9d136910 100755 --- a/indra/llimage/llimagefilter.cpp +++ b/indra/llimage/llimagefilter.cpp @@ -266,7 +266,7 @@ void LLImageFilter::executeFilter(LLPointer<LLImageRaw> raw_image) } else { - llwarns << "Filter unknown, cannot execute filter command : " << filter_name << llendl; + LL_WARNS() << "Filter unknown, cannot execute filter command : " << filter_name << LL_ENDL; } } } |