diff options
| author | Richard Linden <none@none> | 2013-11-06 17:22:04 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-11-06 17:22:04 -0800 |
| commit | fe518bde8e6db65d3d6b178c200410b1346639a4 (patch) | |
| tree | d738e12f8391a675d36aae9d59ced8104846008c /indra/newview/llmimetypes.cpp | |
| parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) | |
| parent | d9d46d908c0573dbcd45ec2a1bea56966823343b (diff) | |
merge with release
Diffstat (limited to 'indra/newview/llmimetypes.cpp')
| -rwxr-xr-x | indra/newview/llmimetypes.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmimetypes.cpp b/indra/newview/llmimetypes.cpp index e689e39b26..790a184068 100755 --- a/indra/newview/llmimetypes.cpp +++ b/indra/newview/llmimetypes.cpp @@ -55,8 +55,8 @@ bool LLMIMETypes::parseMIMETypes(const std::string& xml_filename) bool success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root); if ( ! success || root.isNull() || ! root->hasName( "mimetypes" ) ) { - llwarns << "Unable to read MIME type file: " - << xml_filename << llendl; + LL_WARNS() << "Unable to read MIME type file: " + << xml_filename << LL_ENDL; return false; } |