diff options
author | Richard Linden <none@none> | 2014-04-07 19:09:40 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2014-04-07 19:09:40 -0700 |
commit | 98aabdc176c23de9ba23f902dc2015f9c775d26e (patch) | |
tree | 5ac6ffdb8e9be8d3c2a2f8b591c9971726c6b73c /indra/newview/llchiclet.cpp | |
parent | 7e966f28da79d2d24f93a2615c8807421300700c (diff) | |
parent | e5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (diff) |
merge with release
Diffstat (limited to 'indra/newview/llchiclet.cpp')
-rwxr-xr-x | indra/newview/llchiclet.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index 131aea9da3..b1dce42dfd 100755 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -192,7 +192,7 @@ void LLNotificationChiclet::createMenu() { if(mContextMenu) { - llwarns << "Menu already exists" << llendl; + LL_WARNS() << "Menu already exists" << LL_ENDL; return; } @@ -379,7 +379,7 @@ bool LLIMChiclet::canCreateMenu() { if(mPopupMenu) { - llwarns << "Menu already exists" << llendl; + LL_WARNS() << "Menu already exists" << LL_ENDL; return false; } if(getSessionId().isNull()) @@ -725,7 +725,7 @@ void LLChicletPanel::setChicletToggleState(const LLUUID& session_id, bool toggle { if(session_id.isNull()) { - llwarns << "Null Session ID" << llendl; + LL_WARNS() << "Null Session ID" << LL_ENDL; } // toggle off all chiclets, except specified |