summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/contributions.txt2
-rw-r--r--indra/newview/llpanelpeople.cpp4
-rw-r--r--indra/newview/skins/default/xui/en/panel_people.xml12
3 files changed, 17 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index e20b7b83c5..6d3572fc33 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -691,6 +691,7 @@ Kunnis Basiat
VWR-82
VWR-102
Lance Corrimal
+ STORM-1910
VWR-25269
Latif Khalifa
VWR-5370
@@ -744,6 +745,7 @@ Marc2 Sands
Marianne McCann
Marine Kelley
STORM-281
+ STORM-1910
MartinRJ Fayray
STORM-1844
STORM-1845
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index f1380e7a36..f158a7ea43 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -75,6 +75,8 @@ static const std::string RECENT_TAB_NAME = "recent_panel";
static const std::string COLLAPSED_BY_USER = "collapsed_by_user";
+extern S32 gMaxAgentGroups;
+
/** Comparator for comparing avatar items by last interaction date */
class LLAvatarItemRecentComparator : public LLAvatarItemComparator
{
@@ -878,6 +880,8 @@ void LLPanelPeople::updateButtons()
LLPanel* groups_panel = mTabContainer->getCurrentPanel();
groups_panel->getChildView("activate_btn")->setEnabled(item_selected && !cur_group_active); // "none" or a non-active group selected
groups_panel->getChildView("minus_btn")->setEnabled(item_selected && selected_id.notNull());
+ groups_panel->getChild<LLUICtrl>("groupcount")->setTextArg("[COUNT]", llformat("%d",gAgent.mGroups.count()));
+ groups_panel->getChild<LLUICtrl>("groupcount")->setTextArg("[REMAINING]", llformat("%d",(gMaxAgentGroups-gAgent.mGroups.count())));
}
else
{
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 98c7c49ff4..4383c83a5c 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -434,12 +434,22 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
<group_list
allow_select="true"
follows="all"
- height="356"
+ height="340"
layout="topleft"
left="3"
name="group_list"
top="0"
width="307" />
+ <text
+ type="string"
+ length="1"
+ follows="left|bottom"
+ height="14"
+ layout="topleft"
+ right="-10"
+ name="groupcount">
+You belong to [COUNT] groups, and can join [REMAINING] more.
+ </text>
<panel
background_visible="true"
follows="left|right|bottom"