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/llpanelgrouproles.cpp | |
| parent | da5bd17afd1b78fbd41b247986567204d9470275 (diff) | |
Merge up to 3.7.15 and fix many deprecated logging statements skipped by flickrfolk
Diffstat (limited to 'indra/newview/llpanelgrouproles.cpp')
| -rwxr-xr-x | indra/newview/llpanelgrouproles.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp index 1d7ba4d741..2e747bc4da 100755 --- a/indra/newview/llpanelgrouproles.cpp +++ b/indra/newview/llpanelgrouproles.cpp @@ -1961,7 +1961,7 @@ bool LLPanelGroupRolesSubTab::needsApply(std::string& mesg) LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID); if(!gdatap) { - llwarns << "Unable to get group data for group " << mGroupID << llendl; + LL_WARNS() << "Unable to get group data for group " << mGroupID << LL_ENDL; return false; } @@ -2389,8 +2389,7 @@ void LLPanelGroupRolesSubTab::handleActionCheck(LLUICtrl* ctrl, bool force) } else { - llwarns << "Unable to look up role information for role id: " - << role_id << llendl; + LL_WARNS() << "Unable to look up role information for role id: " << role_id << LL_ENDL; } ////////////////////////////////////////////////////////////////////////// |