diff options
| author | Erica <erica@lindenlab.com> | 2009-12-09 14:34:45 -0800 |
|---|---|---|
| committer | Erica <erica@lindenlab.com> | 2009-12-09 14:34:45 -0800 |
| commit | 6dd56fddd7c84e5bbf7c80ea556b0a694c3823da (patch) | |
| tree | ab74d37db89763092ab402185d27ca371edd440c | |
| parent | 7466aa198a7707f2acadacfb6709bed8351fff96 (diff) | |
| parent | 2a1e3b48f9bb5be755e5ebf03e0e561151f2698d (diff) | |
Automated merge with ssh://hg.lindenlab.com/james/gooey
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_main_inventory.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_appearance.xml | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index 812801abc9..9990215dfd 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -31,10 +31,8 @@ halign="center" layout="topleft" left_delta="-4" name="inventory filter tabs" - tab_min_width="70" tab_height="30" tab_position="top" - tab_height="30" tab_min_width="100" top_pad="4" width="305"> diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index c457dcb526..3dac1a9614 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -119,8 +119,8 @@ left="0" image_disabled="AddItem_Disabled" layout="topleft" left_pad="5" - name="add_btn" - tool_tip="Add new item" + name="newlook_btn" + tool_tip="Add new outfit" width="18" /> <dnd_button follows="bottom|left" @@ -150,7 +150,6 @@ left="0" layout="topleft" left_pad="5" right="-10" - name="newlook_btn" width="100" />--> <panel class="panel_look_info" |