diff options
| author | Richard Linden <none@none> | 2013-10-01 14:28:39 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-01 14:28:39 -0700 |
| commit | 59628d6f85deed89cb35d9343183069cfccd13c0 (patch) | |
| tree | 6b4c35053c2291fd5ff1cccedf86bbd76ce78e1d /indra/llmath/v4color.cpp | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
| parent | 9e486f6c6abbee6cb41ba9a6271d8a025ad924ef (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llmath/v4color.cpp')
| -rwxr-xr-x | indra/llmath/v4color.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llmath/v4color.cpp b/indra/llmath/v4color.cpp index 81ac62be56..cd2be7c8fd 100755 --- a/indra/llmath/v4color.cpp +++ b/indra/llmath/v4color.cpp @@ -245,7 +245,7 @@ void LLColor4::setValue(const LLSD& sd) if (out_of_range) { - llwarns << "LLSD color value out of range!" << llendl; + LL_WARNS() << "LLSD color value out of range!" << LL_ENDL; } #else mV[0] = (F32) sd[0].asReal(); @@ -417,7 +417,7 @@ BOOL LLColor4::parseColor(const std::string& buf, LLColor4* color) if (token_iter == tokens.end()) { // This is a malformed vector. - llwarns << "LLColor4::parseColor() malformed color " << buf << llendl; + LL_WARNS() << "LLColor4::parseColor() malformed color " << buf << LL_ENDL; } else { @@ -704,7 +704,7 @@ BOOL LLColor4::parseColor(const std::string& buf, LLColor4* color) } else { - llwarns << "invalid color " << color_name << llendl; + LL_WARNS() << "invalid color " << color_name << LL_ENDL; } } |