diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-20 16:17:05 -0400 | 
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-20 16:17:05 -0400 | 
| commit | 50810975472a1674e955a063f537011a000dc775 (patch) | |
| tree | 08d392ea88e2cb3e61b2a4eeeb8db08419e3e08c | |
| parent | 6807214bb988e09e678534f23c8380e811df8831 (diff) | |
storm-1910 fix merge of people panel with chui
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_people.xml | 24 | 
1 files changed, 13 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 39a46829b9..ed274d0233 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -396,16 +396,6 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M       *NOTE: no_groups_msg & group_list attributes are not defined as translatable in VLT. See EXT-5931       Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild()      --> -    <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               follows="left|top|right"               height="27" @@ -490,10 +480,22 @@ You belong to [COUNT] groups, and can join [REMAINING] more.                       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"  | 
