summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-10-14 20:37:03 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-10-14 20:37:03 +0000
commitb5ffeaff1ab53008a8f1ee72cd1f398bd1ff21c2 (patch)
treee12431a5c6945b2ece16765bcdb04c241c4d9a96 /indra/newview/skins/default
parent7475ec05fc81e358a6979f3e9d7050ab91511c57 (diff)
merge -r 2014-2032 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
* Bugs: EXT-1005 EXT-1488 EXT-320 EXT-1236 EXT-1236 EXT-1002 EXT-1030 * New Dev: EXT-1293 EXT-1416
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_avatar_list_item.xml17
-rw-r--r--indra/newview/skins/default/xui/en/panel_edit_profile.xml5
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_notify.xml8
-rw-r--r--indra/newview/skins/default/xui/en/panel_profile.xml5
4 files changed, 26 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
index c3ae2d953a..f7f08b9b6a 100644
--- a/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_avatar_list_item.xml
@@ -47,7 +47,7 @@
top="4"
use_ellipses="true"
value="Unknown"
- width="180" />
+ width="162" />
<text
follows="right"
font="SansSerif"
@@ -85,4 +85,19 @@
picture_style="true"
top="2"
width="18" />
+ <button
+ follows="right"
+ font="SansSerifBigBold"
+ height="18"
+ image_disabled="profile_chevron_btn.tga"
+ image_disabled_selected="profile_chevron_btn.tga"
+ image_hover_selected="profile_chevron_btn_active.tga"
+ image_selected="profile_chevron_btn_active.tga"
+ image_unselected="profile_chevron_btn.tga"
+ layout="topleft"
+ left_pad="2"
+ name="profile_btn"
+ picture_style="true"
+ top="2"
+ width="18" />
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index b13058f40a..b728c23bc5 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -14,7 +14,8 @@
width="255">
<string
name="CaptionTextAcctInfo">
- [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+ [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
</string>
<string
name="AcctTypeResident"
@@ -294,7 +295,7 @@
width="100"/>
<text
follows="left|top|right"
- height="15"
+ height="20"
layout="topleft"
left="10"
name="acc_status_text"
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index deea0a44ab..bd98996ae1 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -7,13 +7,13 @@
4
</string>
<panel follows="top" background_visible="true" bevel_style="in" bg_alpha_color="black"
- height="50" label="header" layout="topleft" left="0" name="header"
+ height="30" label="header" layout="topleft" left="0" name="header"
top="0" width="350">
- <icon follows="left|top|right|bottom" height="40" width="40" layout="topleft"
+ <icon follows="left|top|right|bottom" height="20" width="20" layout="topleft"
top="5" left="5" mouse_opaque="true" name="group_icon"/>
<text type="string" length="1" follows="left|top|right|bottom"
- font="SansSerifBigBold" height="20" layout="topleft" left="60" name="title"
- text_color="GroupNotifyTextColor" top="20" width="275" use_ellipses="true">
+ font="SansSerifBigBold" height="20" layout="topleft" left_pad="10" name="title"
+ text_color="GroupNotifyTextColor" top="5" width="275" use_ellipses="true">
Sender Name / Group Name
</text>
</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index 78aff64216..bdd1d80663 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -10,7 +10,8 @@
width="313">
<string
name="CaptionTextAcctInfo">
- [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+ [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
</string>
<string
name="payment_update_link_url">
@@ -198,7 +199,7 @@
width="100"/> -->
<text
follows="left|top"
- height="15"
+ height="20"
layout="topleft"
left="10"
name="acc_status_text"