summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/widgets
diff options
context:
space:
mode:
authorsimon <none@none>2014-10-09 11:07:33 -0700
committersimon <none@none>2014-10-09 11:07:33 -0700
commite8a5c06dc47bbd1965c852890446f9d8b9d2c68b (patch)
treebcc8835cb8ccf49bc11a2534f9759dad1d5bd1c2 /indra/newview/skins/default/xui/en/widgets
parentd7db567f27e6cc30aaffaf38d6ea219a7adf4678 (diff)
parentfa4fdedf51e37a195f5ee6688f1e3a7a0e2bf160 (diff)
Merge downstream code and become 3.7.18
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
-rwxr-xr-xindra/newview/skins/default/xui/en/widgets/combo_box.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
index 82d620d1e6..65f9a143e9 100755
--- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
@@ -7,7 +7,7 @@
<combo_box.combo_button name="Combobox Button"
hover_glow_amount="0.15"
font="SansSerifSmall"
- scale_image="false"
+ scale_image="true"
image_unselected="ComboButton_Off"
image_selected="ComboButton_Selected"
image_disabled="ComboButton_Disabled" />