summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-18 22:09:08 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-18 22:09:08 +0000
commit4a9b231dcc342bfd9cf570ff70d25909cda251cd (patch)
tree5d54b90d9fa5d2ba58b92a74f9e4a9cd1d16868f /indra/newview/skins/default/xui/en
parent1c67e8f386d69e06c1ff820eb551b3c69592ff89 (diff)
parent4ab945c9f0000ead1eca22eefe0829bf3c15d7da (diff)
viewer2 merge.
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/panel_nearby_media.xml12
-rw-r--r--indra/newview/skins/default/xui/en/panel_volume_pulldown.xml13
2 files changed, 8 insertions, 17 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
index acfd63db37..0f911f789e 100644
--- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml
@@ -2,7 +2,9 @@
<panel
can_resize="true"
can_close="false"
- background_opaque="true"
+ bg_opaque_image="Volume_Background"
+ bg_alpha_image="Volume_Background"
+ background_opaque="true"
background_visible="true"
layout="topleft"
width="270"
@@ -16,9 +18,7 @@
<string name="playing_suffix">(playing)</string>
<panel
bevel_style="in"
- bg_alpha_color="0 0 0 0"
- bg_opaque_color="0 0 0 0.3"
- bg_opaque_image="Toast_Background"
+ background_visible="false"
follows="left|right|top"
top="0"
height="30"
@@ -188,9 +188,7 @@
</scroll_list>
<panel
bevel_style="in"
- background_visible="true"
- bg_alpha_color="0.0 0.0 0.0 1.0"
- bg_opaque_color="0 0 0 0.3"
+ background_visible="false"
follows="left|right|bottom"
top_pad="5"
height="30"
diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
index 55ab95bfe9..cd66c56ca1 100644
--- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
+++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_opaque="true"
- background_visible="false"
+ background_visible="true"
+ bg_opaque_image="Volume_Background"
+ bg_alpha_image="Volume_Background"
border_visible="false"
border="false"
chrome="true"
@@ -10,15 +12,6 @@
layout="topleft"
name="volumepulldown_floater"
width="32">
- <!-- floater background image -->
- <icon
- height="150"
- image_name="Volume_Background"
- layout="topleft"
- left="0"
- name="normal_background"
- top="0"
- width="32" />
<slider
control_name="AudioLevelMaster"
follows="left|top"