diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-01-08 13:15:22 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-01-08 13:15:22 -0500 |
| commit | a5a0f571204686290d0be710a3e94448e6f7241e (patch) | |
| tree | 3b47d410487c144a1516443fc8dde911decb9bb9 /indra/newview/skins/default | |
| parent | 3e23a2cffc8857d7041cb6bb5edf83462e4c2f1a (diff) | |
| parent | cdb6f67f7199bbd82fe85ccfd5c9812226eb12ba (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_outfits_inventory.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_appearance.xml | 7 |
2 files changed, 4 insertions, 5 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 74eafb24db..fd540bdc7e 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -85,7 +85,7 @@ <button follows="bottom|left" height="23" - label="Make Outfit" + label="Save Outfit" layout="topleft" name="make_outfit_btn" tool_tip="Save appearance as an outfit" diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index eb95d61865..fab1f11273 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -59,8 +59,7 @@ width="333"> name="currentlook_name"> MyOutfit With a really Long Name like MOOSE </text> - <!--MERGING PERSON! TAKE THIS BIT BELOW FROM THE AVATAR BRANCH! TY -ERICA --> - <!-- <text + <text font="SansSerifSmall" text_color="White_50" width="300" @@ -70,8 +69,8 @@ width="333"> top_pad="5" mouse_opaque="false" name="currentlook_title" > - (current outfit) OR (unsaved) - </text>--> + (unsaved) + </text> </panel> <filter_editor height="23" |