diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-18 10:59:09 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-18 10:59:09 -0800 |
| commit | 4ab945c9f0000ead1eca22eefe0829bf3c15d7da (patch) | |
| tree | 79edcee8dd21487474a37cca9ca433a073e52ae3 /indra/newview/skins/default/xui/en | |
| parent | 7f432e085809a354ce0599c53c8f1f1eec52e18e (diff) | |
| parent | 2231da11dd4b69a94a781e2cbb0cc980f9bdd474 (diff) | |
Merge - updating from hotfix
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_nearby_media.xml | 12 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_volume_pulldown.xml | 13 |
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" |