summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/favorites_bar_button.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml1
-rw-r--r--indra/newview/skins/default/xui/en/floater_voice_controls.xml10
-rw-r--r--indra/newview/skins/default/xui/en/inspect_avatar.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_my_profile.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_notes.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_people.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_pick_info.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_picks.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile.xml8
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile_view.xml2
-rw-r--r--indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml2
-rw-r--r--indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml2
-rw-r--r--indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml2
14 files changed, 25 insertions, 21 deletions
diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
index dfb0695ec3..6adf2a5950 100644
--- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml
+++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml
@@ -3,7 +3,6 @@
<!-- All buttons in the Favorites bar will be created from this one -->
<button
follows="left|bottom"
- font_halign="center"
halign="center"
height="15"
image_disabled="transparent.j2c"
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 243b63db00..613530b7aa 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -17,6 +17,7 @@
min_width="250"
min_height="190">
<layout_stack
+ animate="false"
follows="all"
height="320"
width="360"
diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index ae198d69a3..f473a51ff6 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -3,9 +3,9 @@
can_resize="true"
can_minimize="true"
can_close="false"
- height="275"
+ height="202"
layout="topleft"
- min_height="100"
+ min_height="124"
min_width="190"
name="floater_voice_controls"
help_topic="floater_voice_controls"
@@ -36,7 +36,7 @@
<layout_stack
clip="false"
follows="all"
- height="262"
+ height="189"
layout="topleft"
left="10"
mouse_opaque="false"
@@ -105,13 +105,13 @@
layout="topleft"
left="2"
top_pad="0"
- height="205"
+ height="132"
name="callers_panel"
user_resize="false"
width="280">
<avatar_list
follows="all"
- height="205"
+ height="132"
ignore_online_status="true"
layout="topleft"
multi_select="true"
diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index a666b8a427..9796f7b5b6 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -58,8 +58,10 @@
height="35"
left="8"
name="user_details"
+ right="-10"
word_wrap="true"
top_pad="6"
+ use_ellipses="true"
width="220">This is my second life description and I really think it is great.
</text>
<slider
diff --git a/indra/newview/skins/default/xui/en/panel_my_profile.xml b/indra/newview/skins/default/xui/en/panel_my_profile.xml
index 2659156ba8..34cde61252 100644
--- a/indra/newview/skins/default/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_my_profile.xml
@@ -51,6 +51,7 @@
top="0"
left="0"
height="505"
+ user_resize="false"
width="313">
<scroll_container
color="DkGray2"
@@ -365,6 +366,7 @@
top_pad="0"
name="profile_me_buttons_panel"
visible="false"
+ user_resize="false"
auto_resize="false"
height="28"
width="313">
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index 45b64d5e26..ac100a2c06 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="all"
- height="535"
+ height="540"
label="Notes &amp; Privacy"
layout="topleft"
left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 8a02637817..da3a2274c9 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -3,7 +3,7 @@
<panel
background_visible="true"
follows="all"
- height="570"
+ height="575"
label="People"
layout="topleft"
min_height="350"
@@ -337,7 +337,7 @@ background_visible="true"
</tab_container>
<panel
follows="bottom|left"
- height="25"
+ height="35"
layout="topleft"
left="10"
name="button_bar"
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index 822e049eec..65ccd10cf0 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -39,7 +39,7 @@
height="500"
layout="topleft"
left="10"
- top_pad="10"
+ top_pad="5"
name="profile_scroll"
width="313">
<panel
@@ -102,7 +102,7 @@
</scroll_container>
<panel
follows="left|right|bottom"
- height="20"
+ height="35"
layout="topleft"
top_pad="8"
left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index a2b0adf9d9..d31f4d039f 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="all"
- height="535"
+ height="540"
label="Picks"
layout="topleft"
left="0"
@@ -121,7 +121,7 @@
<panel
layout="topleft"
left="0"
- height="25"
+ height="30"
top_pad="10"
name="buttons_cucks"
width="313">
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 2b907ed251..812dc5ce59 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
follows="all"
- height="535"
+ height="540"
label="Profile"
layout="topleft"
left="0"
@@ -284,7 +284,7 @@
</layout_panel>
<layout_panel
follows="bottom|left"
- height="28"
+ height="30"
layout="topleft"
name="profile_buttons_panel"
auto_resize="false"
@@ -355,7 +355,7 @@
</layout_panel>
<layout_panel
follows="bottom|left"
- height="28"
+ height="30"
layout="topleft"
name="profile_me_buttons_panel"
visible="false"
@@ -364,7 +364,7 @@
follows="bottom|right"
height="23"
left="20"
- top="0"
+ top="0"
label="Edit Profile"
name="edit_profile_btn"
tool_tip="Edit your personal information"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index c51447eaf0..d46e1f9852 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -60,7 +60,7 @@
tab_min_width="80"
tab_height="30"
tab_position="top"
- top_pad="10"
+ top_pad="5"
width="313">
<panel
class="panel_profile"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
index 328d521636..e5cad0df2e 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
@@ -28,7 +28,7 @@
name="adhoc_icon"
width="18" />
<chiclet_im_adhoc.unread_notifications
- font_halign="center"
+ halign="center"
height="23"
left="25"
mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
index 60658899ee..70e4ea8d26 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
@@ -30,7 +30,7 @@
width="19" />
<chiclet_im_group.unread_notifications
height="23"
- font_halign="center"
+ halign="center"
left="25"
mouse_opaque="false"
name="unread"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
index b5b8f0d07a..ec6500cf80 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
@@ -29,7 +29,7 @@
width="19" />
<chiclet_im_p2p.unread_notifications
height="23"
- font_halign="center"
+ halign="center"
left="25"
mouse_opaque="false"
name="unread"