diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-20 17:41:03 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-20 17:41:03 +0200 |
| commit | 7467c005ed3a7269f0247b2551d89c32652953b5 (patch) | |
| tree | 209de46d73d1af1bc7d1b785b2bc100b605015f9 /indra/newview/skins/default/xui/en | |
| parent | 8cd7a2b5f4595c4d824a25147a15ab72aa66a920 (diff) | |
| parent | ba3f7965e35e4eb0d7fcecc7267ec3af5f2d8d87 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/en')
3 files changed, 24 insertions, 14 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index c20aaea2aa..01713cc003 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -35,6 +35,7 @@ <layout_panel left="0" top="0" + width="180" user_resize="false"> <button height="20" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 077667a3fc..8ab5fb1659 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2464,7 +2464,7 @@ function="Advanced.EnableRenderDeferred" /> </menu_item_check> <menu_item_check - label="Global Illumintation" + label="Global Illumination" name="Global Illumination"> <menu_item_check.on_check function="CheckControl" diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index 041297a542..b9a89a2ebc 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -9,9 +9,9 @@ min_width="240" name="appearance panel" width="333"> - <string - name="looks_tab_title" - value="Outfits" /> + <string + name="No Outfit" + value="No Outfit" /> <panel left="5" width="320" height="55" background_visible="true" @@ -19,25 +19,34 @@ bg_alpha_color="0.2 0.2 0.2 1.0" name="panel_currentlook" follows="left|top|right"> + <button + follows="left|right|top" + font="SansSerif" + top="28" right="-10" width="60" height="20" + layout="topleft" + label="Edit" + name="editappearance_btn"/> + <button + follows="left|right|top" + top="28" left="5" width="25" height="22" + image_overlay="Inv_LookFolderOpen" + layout="topleft" + name="openoutfit_btn" + picture_style="true" /> <text - top="-5" width="200" left="5" height="10" follows="left|right|top" + top="10" width="150" left="5" height="15" follows="left|right|top" + layout="topleft" font="SansSerif" text_color="LtGray" word_wrap="true" mouse_opaque="false" name="currentlook_title"> - Current Outfit + Current Outfit: </text> <text - top="-30" left="8" height="10" follows="left|right|top" + top="32" width="150" left="32" height="15" follows="left|right|top" + layout="topleft" font="SansSerifBold" text_color="white" word_wrap="true" mouse_opaque="false" name="currentlook_name" > MyOutfit </text> - <button - follows="left|right|top" - font="SansSerif" - top="28" right="-105" width="60" height="20" - layout="topleft" - label="Edit" - name="editappearance_btn"/> </panel> <filter_editor |