diff options
| author | Graham Linden <graham@lindenlab.com> | 2014-08-29 11:29:37 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2014-08-29 11:29:37 -0700 |
| commit | 297aefd933c1f9646268556eb81132770fd3ce70 (patch) | |
| tree | 7bfc24b0cd5253c4b85a03022139a6705e916de5 /indra/newview/llpanelgroupbulk.cpp | |
| parent | da5bd17afd1b78fbd41b247986567204d9470275 (diff) | |
Merge up to 3.7.15 and fix many deprecated logging statements skipped by flickrfolk
Diffstat (limited to 'indra/newview/llpanelgroupbulk.cpp')
| -rw-r--r-- | indra/newview/llpanelgroupbulk.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelgroupbulk.cpp b/indra/newview/llpanelgroupbulk.cpp index 1eafc5bd64..76792cc6fd 100644 --- a/indra/newview/llpanelgroupbulk.cpp +++ b/indra/newview/llpanelgroupbulk.cpp @@ -387,7 +387,7 @@ void LLPanelGroupBulk::addUsers(uuid_vec_t& agent_ids) } else { - llwarns << "llPanelGroupBulk: Selected avatar has no name: " << dest->getID() << llendl; + LL_WARNS() << "llPanelGroupBulk: Selected avatar has no name: " << dest->getID() << LL_ENDL; names.push_back("(Unknown)"); } } |