From c64486b6ffa78adbf619ff59fd3cb1c263e5c742 Mon Sep 17 00:00:00 2001 From: Baker Linden Date: Tue, 11 Mar 2014 17:10:10 -0700 Subject: Fixed up some compile errors after merge --- indra/newview/llpanelgrouproles.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') 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 t_panel_group_members_subtab("panel_group_banlist_subtab"); +static LLPanelInjector t_panel_group_ban_subtab("panel_group_banlist_subtab"); LLPanelGroupBanListSubTab::LLPanelGroupBanListSubTab() : LLPanelGroupSubTab(), -- cgit v1.2.3