diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-12-17 16:05:52 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-12-17 16:05:52 -0500 |
commit | 49cb11010e2d705560cc988317cf7f228310a7bd (patch) | |
tree | 60f9eee64038786b65ab05c32a174d7ed90d9add /indra/newview/skins | |
parent | d3d454988a37a3f2d3175d10aa6ad44ef68fcaee (diff) | |
parent | c3522ef0ce81830e467302c98ecc05397d7e0547 (diff) |
automated merge avp->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/skins')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_outfits_inventory.xml | 9 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_appearance.xml | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index ab73f135b9..2f176f011b 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -100,5 +100,14 @@ right="-5" top_pad="0" width="90" /> + <button + follows="bottom|left" + height="23" + label="edit look" + layout="topleft" + left_pad="-200" + name="look_edit_btn" + visible="false" + width="90" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index 27f19d44fa..7f4b4aef82 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -107,6 +107,7 @@ left="0" layout="topleft" left="0" name="panel_look_info" + top="35" visible="false" /> <panel class="panel_edit_wearable" @@ -115,6 +116,7 @@ left="0" layout="topleft" left="0" name="panel_edit_wearable" + top="35" visible="false" /> </panel> |