summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-03-20 16:37:00 -0400
committerOz Linden <oz@lindenlab.com>2013-03-20 16:37:00 -0400
commitbd57150f13c64b208c7f36b22f2141665e0b8c80 (patch)
tree185134a47f7b3bd71bafbd8a18e9283b452e9969 /indra/newview/skins
parenta625dbe35ebaf63ad093aedce49a042ee790fe3c (diff)
parent50810975472a1674e955a063f537011a000dc775 (diff)
merge changes for storm-1910
Diffstat (limited to 'indra/newview/skins')
-rw-r--r--indra/newview/skins/default/xui/en/panel_people.xml14
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 7ce2627be9..ed274d0233 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -480,10 +480,22 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
function="People.Group.Minus" />
</dnd_button>
</panel>
+ <text
+ type="string"
+ length="1"
+ follows="all"
+ height="14"
+ layout="topleft"
+ right="-10"
+ top_pad="4"
+ left="3"
+ name="groupcount">
+ You belong to [COUNT] groups, and can join [REMAINING] more.
+ </text>
<group_list
allow_select="true"
follows="all"
- height="406"
+ height="388"
layout="topleft"
left="3"
name="group_list"