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/llfloatergroupbulkban.cpp | |
| parent | da5bd17afd1b78fbd41b247986567204d9470275 (diff) | |
Merge up to 3.7.15 and fix many deprecated logging statements skipped by flickrfolk
Diffstat (limited to 'indra/newview/llfloatergroupbulkban.cpp')
| -rw-r--r-- | indra/newview/llfloatergroupbulkban.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatergroupbulkban.cpp b/indra/newview/llfloatergroupbulkban.cpp index 54a2283b13..44074047a7 100644 --- a/indra/newview/llfloatergroupbulkban.cpp +++ b/indra/newview/llfloatergroupbulkban.cpp @@ -101,7 +101,7 @@ void LLFloaterGroupBulkBan::showForGroup(const LLUUID& group_id, uuid_vec_t* age // Make sure group_id isn't null if (group_id.isNull()) { - llwarns << "LLFloaterGroupInvite::showForGroup with null group_id!" << llendl; + LL_WARNS() << "LLFloaterGroupInvite::showForGroup with null group_id!" << LL_ENDL; return; } |