From dcb349d55db9a9619df965e323de8b7398983da7 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Mon, 25 May 2015 15:37:31 -0400
Subject: [PATCH] Satisfy Issue 1932: Totalgroup member count

---
 indra/newview/llpanelgroupgeneral.cpp                     | 8 ++++++++
 .../newview/skins/default/xui/de/panel_group_general.xml  | 2 +-
 .../skins/default/xui/en-us/panel_group_general.xml       | 2 +-
 .../newview/skins/default/xui/en-us/panel_group_roles.xml | 4 +---
 .../newview/skins/default/xui/es/panel_group_general.xml  | 2 +-
 .../newview/skins/default/xui/fr/panel_group_general.xml  | 2 +-
 .../newview/skins/default/xui/it/panel_group_general.xml  | 2 +-
 .../newview/skins/default/xui/pt/panel_group_general.xml  | 2 +-
 8 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 84c5997a1..2ef89ad71 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -60,6 +60,7 @@
 #include "llviewerwindow.h"
 
 #include "hippogridmanager.h"
+#include <boost/lexical_cast.hpp>
 
 // consts
 const S32 MATURE_CONTENT = 1;
@@ -267,6 +268,11 @@ BOOL LLPanelGroupGeneral::postBuild()
 		mGroupName->setVisible(FALSE);
 	}
 
+	std::string member_count(LLTrans::getString("LoadingData"));
+	if (LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID))
+		member_count = boost::lexical_cast<std::string>(gdatap->mMembers.size());
+	getChild<LLUICtrl>("text_owners_and_visible_members")->setTextArg("[COUNT]", member_count);
+
 	return LLPanelGroupTab::postBuild();
 }
 
@@ -833,6 +839,8 @@ void LLPanelGroupGeneral::updateMembers()
 		}
 	}
 
+	getChild<LLUICtrl>("text_owners_and_visible_members")->setTextArg("[COUNT]", boost::lexical_cast<std::string>(gdatap->mMembers.size()));
+
 	if (mMemberProgress == gdatap->mMembers.end())
 	{
 		lldebugs << "   member list completed." << llendl;
diff --git a/indra/newview/skins/default/xui/de/panel_group_general.xml b/indra/newview/skins/default/xui/de/panel_group_general.xml
index c6873ad9f..3dc3c1cf9 100644
--- a/indra/newview/skins/default/xui/de/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_general.xml
@@ -19,7 +19,7 @@ Bewegen Sie die Maus über die Optionen, um weitere Informationen anzuzeigen.</s
 	<text_editor name="charter">Gruppencharta</text_editor>
 	<button label="Beitreten (0 L$)" label_selected="Beitreten (0 L$)" name="join_button"/>
 	<button label="Detailansicht" label_selected="Detailansicht" name="info_button"/>
-	<text name="text_owners_and_visible_members">Eigentümer und sichtbare Mitglieder</text>
+	<text name="text_owners_and_visible_members">Eigentümer und sichtbare Mitglieder ([COUNT])</text>
 	<text name="text_owners_are_shown_in_bold">(Eigentümer werden fettgedruckt angezeigt)</text>
 	<name_list name="visible_members">
 		<column label="Mitgliedsname" name="name"/>
diff --git a/indra/newview/skins/default/xui/en-us/panel_group_general.xml b/indra/newview/skins/default/xui/en-us/panel_group_general.xml
index 53f9a8cfd..6a1509cf1 100644
--- a/indra/newview/skins/default/xui/en-us/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_group_general.xml
@@ -68,7 +68,7 @@ Hover your mouse over the options for more help.
 	     left_delta="0" mouse_opaque="true" name="info_button" width="106" />
 	<button bottom_delta="0" follows="left|top" height="22" label="" left_delta="106"  width="22" scale_image="true" image_selected="tool_zoom.tga" image_unselected="tool_zoom.tga" image_hover_selected="tool_zoom_active.tga" image_hover_unselected="tool_zoom_active.tga" name="bigimg"/>
 	<text bottom_delta="-16" left_delta="-106" font="SansSerif" name="text_owners_and_visible_members">
-		Owners &amp; Visible Members
+		Owners &amp; Visible Members ([COUNT])
 	</text>
 	<text bottom_delta="-16" font="SansSerifSmall" left_delta="0"
 	     name="text_owners_are_shown_in_bold">
diff --git a/indra/newview/skins/default/xui/en-us/panel_group_roles.xml b/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
index cdc6594de..2934e4812 100644
--- a/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
@@ -80,9 +80,7 @@ execute the Ability.
 			     border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
 			     height="16" is_unicode="false" left="4" max_length="63" mouse_opaque="true"
 			     name="filter_input" width="100" />
-			<button bottom_delta="-2" font="SansSerifSmall" halign="center" height="20"
-			     label="Search" left_delta="105" name="search_button" width="60" />
-			<name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-121"
+			<name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-123"
 			     column_padding="0" draw_border="true" draw_heading="true"
 			     heading_font="SansSerifSmall" menu_num="0" name_system="GroupMembersNameSystem"
 			     heading_height="14" height="120" left="4" multi_select="true"
diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml
index 1b700badf..61d767b66 100644
--- a/indra/newview/skins/default/xui/es/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_general.xml
@@ -34,7 +34,7 @@ Coloca el cursor sobre las opciones para más información.
 	<button label="Entrar ([CURRENCY]0)" label_selected="Entrar ([CURRENCY]0)" name="join_button"/>
 	<button label="Ver Detalles" label_selected="Ver Detalles" name="info_button"/>
 	<text name="text_owners_and_visible_members">
-		Propietarios y Miembros Visibles
+		Propietarios y Miembros Visibles ([COUNT])
 	</text>
 	<text name="text_owners_are_shown_in_bold">
 		(Los Propietarios aparecen en Negrita)
diff --git a/indra/newview/skins/default/xui/fr/panel_group_general.xml b/indra/newview/skins/default/xui/fr/panel_group_general.xml
index dcc3b8964..69faede20 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_general.xml
@@ -52,7 +52,7 @@
 	     height="22" label="Detailed View" label_selected="Detailed View"
 	     left_delta="0" mouse_opaque="true" name="info_button" width="128" />
 	<text bottom_delta="-16" font="SansSerif" name="text_owners_and_visible_members">
-		Propri&#xE9;taires et membres visibles
+		Propri&#xE9;taires et membres visibles ([COUNT])
 	</text>
 	<text bottom_delta="-16" font="SansSerifSmall" left_delta="0"
 	     name="text_owners_are_shown_in_bold">
diff --git a/indra/newview/skins/default/xui/it/panel_group_general.xml b/indra/newview/skins/default/xui/it/panel_group_general.xml
index 6b6dfe85f..e707e112e 100644
--- a/indra/newview/skins/default/xui/it/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_general.xml
@@ -31,7 +31,7 @@ Passa il mouse sulle opzioni per un aiuto aggiuntivo.
 	<button label="Unisciti (0 [CURRENCY])" label_selected="Unisciti (0 [CURRENCY])" name="join_button"/>
 	<button label="Visualizza dettagli" label_selected="Visualizza dettagli" name="info_button"/>
 	<text name="text_owners_and_visible_members">
-		Proprietari &amp; Membri visibili
+		Proprietari &amp; Membri visibili ([COUNT])
 	</text>
 	<text name="text_owners_are_shown_in_bold">
 		(I proprietari sono scritti in neretto)
diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml
index 11e21d394..eba9a005e 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml
@@ -27,7 +27,7 @@
 	<button label="Unir ([CURRENCY]0)" label_selected="Unir ([CURRENCY]0)" name="join_button"/>
 	<button label="Vista detalhada" label_selected="Vista detalhada" name="info_button"/>
 	<text name="text_owners_and_visible_members">
-		Proprietários &amp; Membros visíveis
+		Proprietários &amp; Membros visíveis ([COUNT])
 	</text>
 	<text name="text_owners_are_shown_in_bold">
 		(Proprietários são mostrados em negrito )