diff options
| author | Baker Linden <baker@lindenlab.com> | 2014-03-11 16:32:23 -0700 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2014-03-11 16:32:23 -0700 |
| commit | 6137e120d1836ea37ea8f5f6723d86db94f31bd8 (patch) | |
| tree | 16341e6203400d52e89189d96206c26e899dbe44 /indra/newview/llpanelgrouproles.cpp | |
| parent | b0c1dd4790847364ebcab1cb1d4103500f64072e (diff) | |
| parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) | |
3.7.4. merge
Diffstat (limited to 'indra/newview/llpanelgrouproles.cpp')
| -rwxr-xr-x | indra/newview/llpanelgrouproles.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp index b1ea8b7e57..67a8493d63 100755 --- a/indra/newview/llpanelgrouproles.cpp +++ b/indra/newview/llpanelgrouproles.cpp @@ -56,7 +56,7 @@ #include "roles_constants.h" -static LLRegisterPanelClassWrapper<LLPanelGroupRoles> t_panel_group_roles("panel_group_roles"); +static LLPanelInjector<LLPanelGroupRoles> t_panel_group_roles("panel_group_roles"); bool agentCanRemoveFromRole(const LLUUID& group_id, const LLUUID& role_id) @@ -783,7 +783,7 @@ void LLPanelGroupSubTab::setFooterEnabled(BOOL enable) // LLPanelGroupMembersSubTab ///////////////////////////////////////////// -static LLRegisterPanelClassWrapper<LLPanelGroupMembersSubTab> t_panel_group_members_subtab("panel_group_members_subtab"); +static LLPanelInjector<LLPanelGroupMembersSubTab> t_panel_group_members_subtab("panel_group_members_subtab"); LLPanelGroupMembersSubTab::LLPanelGroupMembersSubTab() : LLPanelGroupSubTab(), @@ -1631,9 +1631,11 @@ void LLPanelGroupMembersSubTab::addMemberToList(LLGroupMemberData* data) item_params.columns.add().column("donated").value(donated.getString()) .font.name("SANSSERIF_SMALL").style("NORMAL"); - item_params.columns.add().column("online").value(data->getOnlineStatus()) - .font.name("SANSSERIF_SMALL").style("NORMAL"); - + item_params.columns.add().column("online").value(data->getOnlineStatus()) + .font.name("SANSSERIF_SMALL").style("NORMAL"); + + item_params.columns.add().column("title").value(data->getTitle()).font.name("SANSSERIF_SMALL").style("NORMAL");; + mMembersList->addNameItemRow(item_params); mHasMatch = TRUE; @@ -1781,7 +1783,7 @@ void LLPanelGroupMembersSubTab::handleBanMember() // LLPanelGroupRolesSubTab /////////////////////////////////////////////// -static LLRegisterPanelClassWrapper<LLPanelGroupRolesSubTab> t_panel_group_roles_subtab("panel_group_roles_subtab"); +static LLPanelInjector<LLPanelGroupRolesSubTab> t_panel_group_roles_subtab("panel_group_roles_subtab"); LLPanelGroupRolesSubTab::LLPanelGroupRolesSubTab() : LLPanelGroupSubTab(), @@ -2595,7 +2597,7 @@ void LLPanelGroupRolesSubTab::setGroupID(const LLUUID& id) // LLPanelGroupActionsSubTab ///////////////////////////////////////////// -static LLRegisterPanelClassWrapper<LLPanelGroupActionsSubTab> t_panel_group_actions_subtab("panel_group_actions_subtab"); +static LLPanelInjector<LLPanelGroupActionsSubTab> t_panel_group_actions_subtab("panel_group_actions_subtab"); LLPanelGroupActionsSubTab::LLPanelGroupActionsSubTab() : LLPanelGroupSubTab() @@ -2782,7 +2784,7 @@ void LLPanelGroupActionsSubTab::setGroupID(const LLUUID& id) // LLPanelGroupBanListSubTab ///////////////////////////////////////////// -static LLRegisterPanelClassWrapper<LLPanelGroupBanListSubTab> t_panel_group_ban_subtab("panel_group_banlist_subtab"); +static LLPanelInjector<LLPanelGroupBanListSubTab> t_panel_group_members_subtab("panel_group_banlist_subtab"); LLPanelGroupBanListSubTab::LLPanelGroupBanListSubTab() : LLPanelGroupSubTab(), |