diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-05-07 09:31:20 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-05-07 09:31:20 -0700 |
| commit | fbe10b8ee0537c71f2119142f4e0da1bd69d1a53 (patch) | |
| tree | b5ac3f23c9fbd7dba299cd7aa2e8e4f812df98f6 /indra/llmath/v4color.cpp | |
| parent | 1953c569a6acfd731af2c459da7a6928be4aaf5b (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
Merge with 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; } } |