diff options
author | Merov Linden <merov@lindenlab.com> | 2014-09-28 21:40:32 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-09-28 21:40:32 -0700 |
commit | 4b80a5ed059d91bc37558db8ed664365e39d21d6 (patch) | |
tree | 55cfddc381448a72b54c03347deabada9687f629 /indra/newview/llpanelgrouproles.cpp | |
parent | 896f48229e577b1bcf94f2cb80d73a6bf1a9330c (diff) | |
parent | 499f5aa9a4b46d61ee94b26d5c86bc032766af70 (diff) |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llpanelgrouproles.cpp')
-rwxr-xr-x | indra/newview/llpanelgrouproles.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp index 1d7ba4d741..c3a10b3fa0 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,8 @@ 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; } ////////////////////////////////////////////////////////////////////////// @@ -2835,7 +2835,7 @@ void LLPanelGroupActionsSubTab::setGroupID(const LLUUID& id) if(mActionMembers) mActionMembers->deleteAllItems(); if(mActionDescription) mActionDescription->clear(); - + LLPanelGroupSubTab::setGroupID(id); } |