diff options
| author | Richard Linden <none@none> | 2013-07-30 19:15:46 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-07-30 19:15:46 -0700 |
| commit | 5762c1d0d727f0050aefe7126ab2d5280bebfb9b (patch) | |
| tree | 78bdcc931460dfc45d35cd1707ddf1afdf049a2e /indra/newview/lllogchat.cpp | |
| parent | 4cca9ba279f908f206fa5e32adccf1038f05cc7f (diff) | |
| parent | 910874a7e32bdfc456474e2d0ee84d190be3011e (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/lllogchat.cpp')
| -rwxr-xr-x | indra/newview/lllogchat.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index 2d7454b636..60272749ff 100755 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -292,7 +292,7 @@ void LLLogChat::saveHistory(const std::string& filename, if (tmp_filename.empty()) { std::string warn = "Chat history filename [" + filename + "] is empty!"; - llwarning(warn, 666); + LL_WARNS() << warn << LL_ENDL; llassert(tmp_filename.size()); return; } @@ -662,7 +662,7 @@ void LLChatLogFormatter::format(const LLSD& im, std::ostream& ostr) const { if (!im.isMap()) { - llwarning("invalid LLSD type of an instant message", 0); + LL_WARNS() << "invalid LLSD type of an instant message" << LL_ENDL; return; } |