From e018ecf4696aa17c7696c2b8f8bed2ac2d149eae Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 27 Oct 2009 15:01:09 -0700
Subject: EXT-1352 First pass background images for floaters and panels,
 including pretty header. Reviewed with Leyla.

---
 indra/newview/skins/default/xui/en/widgets/floater.xml | 3 +++
 indra/newview/skins/default/xui/en/widgets/panel.xml   | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml
index 4a866c2eb2..ece6373166 100644
--- a/indra/newview/skins/default/xui/en/widgets/floater.xml
+++ b/indra/newview/skins/default/xui/en/widgets/floater.xml
@@ -1,6 +1,9 @@
 <?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"/>
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"/>
-- 
cgit v1.2.3


From 7f4d3266382b29d9dcba9dee2c1e279aa4639b9e Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 27 Oct 2009 16:27:26 -0700
Subject: EXT-1352 Use image backgrounds for inspectors and toasts. Art only,
 not reviewed.

---
 indra/newview/skins/default/xui/en/inspect_avatar.xml | 2 +-
 indra/newview/skins/default/xui/en/inspect_group.xml  | 2 +-
 indra/newview/skins/default/xui/en/inspect_object.xml | 2 +-
 indra/newview/skins/default/xui/en/panel_toast.xml    | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins/default/xui')

diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
index 181c80ebc7..1e44032b97 100644
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml
@@ -5,7 +5,7 @@
 -->
 <floater
  bevel_style="in"
- bg_opaque_color="MouseGray"
+ bg_opaque_image="Inspector_Background" 
  can_close="false"
  can_minimize="false"
  height="138"
diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml
index 5b166e83b8..477fbfd827 100644
--- a/indra/newview/skins/default/xui/en/inspect_group.xml
+++ b/indra/newview/skins/default/xui/en/inspect_group.xml
@@ -5,7 +5,7 @@
 -->
 <floater
  bevel_style="in"
- bg_opaque_color="MouseGray"
+ bg_opaque_image="Inspector_Background" 
  can_close="false"
  can_minimize="false"
  height="138"
diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml
index 73a7bef77d..50d49a9e0f 100644
--- a/indra/newview/skins/default/xui/en/inspect_object.xml
+++ b/indra/newview/skins/default/xui/en/inspect_object.xml
@@ -5,7 +5,7 @@
 -->
 <floater
  bevel_style="in"
- bg_opaque_color="MouseGray"
+ bg_opaque_image="Inspector_Background" 
  can_close="false"
  can_minimize="false"
  height="145"
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 2e500fc2aa..894ac07372 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -12,6 +12,8 @@
   top="500"
   follows="right|bottom" 
   bevel_style="in"
+  bg_opaque_image="Toast_Background" 
+  bg_alpha_image="Toast_Background" 
   can_minimize="false"
   can_tear_off="false"
   can_resize="false"
-- 
cgit v1.2.3