From 2ac262cf3e27a40c966466e5a04992a4d4ee9346 Mon Sep 17 00:00:00 2001
From: Drake Arconis <drake@alchemyviewer.org>
Date: Tue, 28 Jul 2015 14:45:01 -0400
Subject: [PATCH] Fix group CSV export button
---
indra/newview/llpanelgrouproles.cpp | 4 +++
.../default/xui/en/panel_group_roles.xml | 30 +++++++++++++++----
2 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index 30029897b8..e6e50648c3 100755
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -881,6 +881,10 @@ BOOL LLPanelGroupMembersSubTab::postBuildSubTab(LLView* root)
void LLPanelGroupMembersSubTab::setGroupID(const LLUUID& id)
{
+ LLButton* button = getChild<LLButton>("export_list");
+ if (button)
+ button->setEnabled(gAgent.hasPowerInGroup(mGroupID, GP_MEMBER_VISIBLE_IN_DIR));
+
//clear members list
if(mMembersList) mMembersList->deleteAllItems();
if(mAssignedRolesList) mAssignedRolesList->deleteAllItems();
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 55fab0cad2..7e1809c2de 100755
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -123,7 +123,7 @@ clicking on their names.
left="0"
name="btn_invite_lp"
auto_resize="true"
- width="91">
+ width="68">
<button
follows="top|left|right"
height="23"
@@ -132,7 +132,7 @@ clicking on their names.
left="1"
top="0"
name="member_invite"
- width="90" />
+ width="67" />
</layout_panel>
<layout_panel
follows="top|left|right"
@@ -141,7 +141,7 @@ clicking on their names.
left_pad="2"
name="eject_btn_lp"
auto_resize="true"
- width="91">
+ width="68">
<button
follows="top|left|right"
left="1"
@@ -150,7 +150,7 @@ clicking on their names.
label="Eject"
layout="topleft"
top="0"
- width="90" />
+ width="67" />
</layout_panel>
<layout_panel
follows="top|left|right"
@@ -159,7 +159,7 @@ clicking on their names.
left_pad="2"
name="ban_btn_lp"
auto_resize="true"
- width="91">
+ width="68">
<button
follows="top|left|right"
left="1"
@@ -168,7 +168,25 @@ clicking on their names.
label="Ban"
layout="topleft"
top="0"
- width="90" />
+ width="67" />
+ </layout_panel>
+ <layout_panel
+ follows="top|left|right"
+ height="23"
+ layout="topleft"
+ left_pad="2"
+ name="export_btn_lp"
+ auto_resize="true"
+ width="68">
+ <button
+ follows="top|left|right"
+ left="1"
+ height="23"
+ name="export_list"
+ label="Export"
+ layout="topleft"
+ top="0"
+ width="67" />
</layout_panel>
</layout_stack>
</panel>
--
GitLab