summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-12-14 16:02:15 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2012-12-14 16:02:15 -0800
commit080a77a0d98905b2eccf9a0a30dbcd691dab83bd (patch)
tree77d083e0b837c7a6000b651a3e11015f74824347 /indra/newview/skins/default/xui/en
parent68b61bdec620014f30d6e9c63726d96fa7f4382a (diff)
parent56b23a8727af34d950e217affa784d322b737cc3 (diff)
mergiing in latest changes
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_people.xml8
-rw-r--r--indra/newview/skins/default/xui/en/panel_people.xml4
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml
index 8e143623ab..701233ba4a 100644
--- a/indra/newview/skins/default/xui/en/floater_people.xml
+++ b/indra/newview/skins/default/xui/en/floater_people.xml
@@ -6,21 +6,21 @@
can_resize="true"
height="570"
help_topic="sidebar_people"
- min_height="440"
- min_width="390"
+ min_height="220"
+ min_width="260"
layout="topleft"
name="floater_people"
save_rect="true"
single_instance="true"
reuse_instance="true"
title="PEOPLE"
- width="390">
+ width="370">
<panel_container
default_panel_name="panel_people"
follows="all"
height="570"
name="main_panel"
- width="390">
+ width="370">
<panel
class="panel_people"
name="panel_people"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 7433ad828d..7ce2627be9 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -229,7 +229,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
bg_opaque_color="DkGray"
bottom="-1"
follows="all"
- label="MY FRIENDS"
+ label="FRIENDS"
layout="topleft"
left="0"
help_topic="people_friends_tab"
@@ -385,7 +385,7 @@ Looking for people to hang out with? Try the [secondlife:///app/worldmap World M
bg_opaque_color="DkGray"
bottom="-1"
follows="all"
- label="MY GROUPS"
+ label="GROUPS"
layout="topleft"
left="0"
help_topic="people_groups_tab"