diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-05-07 11:14:26 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-05-07 11:14:26 -0700 |
| commit | 48fece44737fa8b9614fd864354d9287a216ea33 (patch) | |
| tree | f68426d79f4631c6b49be142a92e59086870fa38 /indra/llappearance/lltexglobalcolor.cpp | |
| parent | ae856ef31830912cec0f4de37167858a24e4ba30 (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
Merge with 3.7.7-release
Diffstat (limited to 'indra/llappearance/lltexglobalcolor.cpp')
| -rw-r--r-- | indra/llappearance/lltexglobalcolor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llappearance/lltexglobalcolor.cpp b/indra/llappearance/lltexglobalcolor.cpp index 16b0260d1a..186c537659 100644 --- a/indra/llappearance/lltexglobalcolor.cpp +++ b/indra/llappearance/lltexglobalcolor.cpp @@ -129,7 +129,7 @@ BOOL LLTexGlobalColorInfo::parseXml(LLXmlTreeNode* node) static LLStdStringHandle name_string = LLXmlTree::addAttributeString("name"); if (!node->getFastAttributeString(name_string, mName)) { - llwarns << "<global_color> element is missing name attribute." << llendl; + LL_WARNS() << "<global_color> element is missing name attribute." << LL_ENDL; return FALSE; } // <param> sub-element |