diff options
author | James Cook <james@lindenlab.com> | 2009-10-29 15:39:29 -0700 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-10-29 15:39:29 -0700 |
commit | a1ec40c72beeb4ce80946b3050ac7f9ea8f40c9c (patch) | |
tree | 3143a5e91c5d76889b106654fba8458c1b611ab9 /indra/newview/skins/default/xui/en/widgets | |
parent | b86d4b2299aa0b9321ddcbdb5246fe131aa4255c (diff) | |
parent | 8f8718546a4d9d9a6d70d292814edea889e20e27 (diff) |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
-rw-r--r-- | indra/newview/skins/default/xui/en/widgets/floater.xml | 7 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/widgets/panel.xml | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml index 4a866c2eb2..82f6d44f78 100644 --- a/indra/newview/skins/default/xui/en/widgets/floater.xml +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml @@ -1,6 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- See also settings.xml UIFloater* settings for configuration --> <floater name="floater" bg_opaque_color="FloaterFocusBackgroundColor" bg_alpha_color="FloaterDefaultBackgroundColor" + bg_opaque_image="Window_Foreground" + bg_alpha_image="Window_Background" background_visible="true" - background_opaque="false"/> + background_opaque="false" + header_height="25" + legacy_header_height="18" /> diff --git a/indra/newview/skins/default/xui/en/widgets/panel.xml b/indra/newview/skins/default/xui/en/widgets/panel.xml index b81a70b845..127f0f40e8 100644 --- a/indra/newview/skins/default/xui/en/widgets/panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/panel.xml @@ -1,5 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<!-- Optional parameters: + bg_opaque_image - image name for "in-front" panel look + bg_alpha_image - image name for "in-back" or transparent panel look +--> <panel bg_opaque_color="PanelFocusBackgroundColor" bg_alpha_color="PanelDefaultBackgroundColor" background_visible="false" - background_opaque="false"/>
\ No newline at end of file + background_opaque="false"/> |