diff -r 33a11c2e6c61 -r 275e5ab93bfa doc/contributions.txt
--- a/doc/contributions.txt	Wed Sep 12 18:37:11 2012 -0400
+++ b/doc/contributions.txt	Thu Sep 13 23:01:14 2012 +0200
@@ -691,6 +691,7 @@
 	VWR-82
 	VWR-102
 Lance Corrimal
+	STORM-1910
 	VWR-25269
 Latif Khalifa
 	VWR-5370
@@ -744,6 +745,7 @@
 Marianne McCann
 Marine Kelley
     STORM-281
+    STORM-1910
 MartinRJ Fayray
     STORM-1844
     STORM-1845
diff -r 33a11c2e6c61 -r 275e5ab93bfa indra/newview/llpanelpeople.cpp
--- a/indra/newview/llpanelpeople.cpp	Wed Sep 12 18:37:11 2012 -0400
+++ b/indra/newview/llpanelpeople.cpp	Thu Sep 13 23:01:14 2012 +0200
@@ -75,6 +75,8 @@
 
 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 @@
 		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 -r 33a11c2e6c61 -r 275e5ab93bfa indra/newview/skins/default/xui/en/panel_people.xml
--- a/indra/newview/skins/default/xui/en/panel_people.xml	Wed Sep 12 18:37:11 2012 -0400
+++ b/indra/newview/skins/default/xui/en/panel_people.xml	Thu Sep 13 23:01:14 2012 +0200
@@ -434,12 +434,22 @@
             <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"