diff options
| author | Richard Linden <none@none> | 2013-10-03 19:05:52 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-03 19:05:52 -0700 |
| commit | bee38adb347213bc1824dad8a762dc399c3065ec (patch) | |
| tree | b1db05808d35d0dcc168a799f8a2a47b6d1160e0 /indra/newview/llviewerobject.cpp | |
| parent | 9ae025f8ee8688b25678a243ba19f1398de08060 (diff) | |
| parent | f8a85003ddd4bee1ae00fc329c1c1d66d6100cbd (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rwxr-xr-x | indra/newview/llviewerobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index dd80a4f65d..f2abadce85 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4756,7 +4756,7 @@ bool LLViewerObject::isImageAlphaBlended(const U8 te) const case GL_RGB: break; default: { - llwarns << "Unexpected tex format in LLViewerObject::isImageAlphaBlended...returning no alpha." << llendl; + LL_WARNS() << "Unexpected tex format in LLViewerObject::isImageAlphaBlended...returning no alpha." << LL_ENDL; } break; } |