diff options
author | angela <angela@lindenlab.com> | 2009-10-30 10:48:10 +0800 |
---|---|---|
committer | angela <angela@lindenlab.com> | 2009-10-30 10:48:10 +0800 |
commit | 22e29b1a856343a13ca5c3f015226cf6544fd9e8 (patch) | |
tree | 78b4dc789106678ebb1643f49a5d090e323db05a /indra/newview/skins/default/xui/en/widgets | |
parent | a74e12d26b645063c4373c8354667423dec2d3f0 (diff) | |
parent | 5c4ec60c966bd1857fb195f73d2d09117b783f9a (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"/> |