diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-05-25 11:26:08 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-05-25 11:26:08 -0700 |
| commit | e5ca2b4b82704d11172e0c32761138ec0f58fbe3 (patch) | |
| tree | 5875b249bf68502e9e75fac24d9510496c0c9baf /indra/newview/skins/default/xui | |
| parent | f8907b327bb0009047b9cef54fde3d7dc6e8d6ca (diff) | |
| parent | 33e4a2c7b1ab3a06f1adb5edd9850523c897ea77 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 25 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/badge.xml | 14 |
2 files changed, 32 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index 7663db2756..fa79975669 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -26,7 +26,7 @@ top="0" orientation="vertical" name="inventory_layout_stack" - height="540" + height="535" width="330"> <layout_panel width="330" @@ -47,6 +47,7 @@ <layout_panel width="330" auto_resize="true" + user_resize="false" follows="bottom|left|right" min_dim="35" name="inbox_layout_panel" @@ -75,8 +76,7 @@ tab_stop="false" pad_left="35" top="0" - left="10" - ></button> + left="10" /> <panel follows="all" left="10" @@ -102,12 +102,12 @@ top="0" width="308" /> </panel> - </panel> </layout_panel> <layout_panel width="330" auto_resize="true" + user_resize="false" follows="bottom|left|right" name="outbox_layout_panel" min_dim="35" @@ -136,8 +136,19 @@ halign="left" pad_left="35" top="0" - left="0" - ></button> + left="0" /> + <button + label="SYNC" + is_toggle="false" + name="outbox_sync_btn" + follows="top|right" + height="25" + tab_stop="false" + width="45" + halign="center" + top="5" + left="-50" + enabled="false" /> <panel follows="all" left="0" @@ -163,7 +174,7 @@ layout="topleft" name="button_panel" left="9" - top_pad="2" + top_pad="7" width="308"> <layout_stack follows="bottom|left|right" diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml new file mode 100644 index 0000000000..4eb633ac0c --- /dev/null +++ b/indra/newview/skins/default/xui/en/widgets/badge.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Additional attributes: + --> +<badge font="SansSerifSmall" + image="Badge" + image_color="BadgeImageColor" + label_color="BadgeLabelColor" + location="top_left" + location_percent_hcenter="85" + location_percent_vcenter="85" + padding_horiz="7" + padding_vert="4" + > +</badge> |