diff options
| author | Baker Linden <baker@lindenlab.com> | 2014-03-11 17:10:10 -0700 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2014-03-11 17:10:10 -0700 |
| commit | c64486b6ffa78adbf619ff59fd3cb1c263e5c742 (patch) | |
| tree | bcec9c05b70f6a23dcf30b0d86a54ea96545319f /indra | |
| parent | 6137e120d1836ea37ea8f5f6723d86db94f31bd8 (diff) | |
Fixed up some compile errors after merge
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llpanelgrouproles.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp index 67a8493d63..d1eae8027a 100755 --- a/indra/newview/llpanelgrouproles.cpp +++ b/indra/newview/llpanelgrouproles.cpp @@ -1908,7 +1908,7 @@ bool LLPanelGroupRolesSubTab::needsApply(std::string& mesg) if(!gdatap) { llwarns << "Unable to get group data for group " << mGroupID << llendl; - return; + return false; } @@ -2784,7 +2784,7 @@ void LLPanelGroupActionsSubTab::setGroupID(const LLUUID& id) // LLPanelGroupBanListSubTab ///////////////////////////////////////////// -static LLPanelInjector<LLPanelGroupBanListSubTab> t_panel_group_members_subtab("panel_group_banlist_subtab"); +static LLPanelInjector<LLPanelGroupBanListSubTab> t_panel_group_ban_subtab("panel_group_banlist_subtab"); LLPanelGroupBanListSubTab::LLPanelGroupBanListSubTab() : LLPanelGroupSubTab(), |