summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/widgets
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-02 15:28:40 -0500
committerOz Linden <oz@lindenlab.com>2010-12-02 15:28:40 -0500
commit90a365ed2f13612d267a4eed9b54bd1b62edb7d5 (patch)
tree8e50ccd3db712740de388fa2a46b703a5c313567 /indra/newview/skins/default/xui/en/widgets
parent7fedfda82504a8881b7d19d6c6f00fba849e615f (diff)
parentc1dbf70113274d543019778894f3e4017a174d7d (diff)
merge fix for STORM-673
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
-rw-r--r--indra/newview/skins/default/xui/en/widgets/avatar_icon.xml4
-rw-r--r--indra/newview/skins/default/xui/en/widgets/button.xml3
-rw-r--r--indra/newview/skins/default/xui/en/widgets/icon.xml1
3 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml
index a35e2c3663..a1e32e44de 100644
--- a/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml
+++ b/indra/newview/skins/default/xui/en/widgets/avatar_icon.xml
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<avatar_icon default_icon_name="Generic_Person_Large">
+<avatar_icon
+ default_icon_name="Generic_Person_Large"
+ use_draw_context_alpha="false">
</avatar_icon>
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 2d0a1728d5..1746a045cf 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -24,5 +24,6 @@
halign="center"
pad_bottom="3"
height="23"
- scale_image="true">
+ scale_image="true"
+ use_draw_context_alpha="true">
</button>
diff --git a/indra/newview/skins/default/xui/en/widgets/icon.xml b/indra/newview/skins/default/xui/en/widgets/icon.xml
index adb743a628..cf8edfcedb 100644
--- a/indra/newview/skins/default/xui/en/widgets/icon.xml
+++ b/indra/newview/skins/default/xui/en/widgets/icon.xml
@@ -3,5 +3,6 @@
tab_stop="false"
mouse_opaque="false"
name="icon"
+ use_draw_context_alpha="true"
follows="left|top">
</icon>