diff options
author | Oz Linden <oz@lindenlab.com> | 2011-09-15 15:28:11 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-09-15 15:28:11 -0400 |
commit | c1f211cac1a4aa84bb538cfdcaa3b9190c43eb0c (patch) | |
tree | 8483762847618e59652a6163f32d2aa932378f3d /indra | |
parent | daf0b047faa5b8fd82de5a77aa098eb7f0cdca0f (diff) | |
parent | 2c03ee82ecee87c61546be86b28cff2252fd643a (diff) |
merge changes for storm-1599
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_navigation_bar.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 9749b6fdd4..51ffec4727 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -146,7 +146,8 @@ border.highlight_light_color="FocusColor" border.highlight_dark_color="FocusColor" border.shadow_light_color="FocusColor" - border.shadow_dark_color="FocusColor"/> + border.shadow_dark_color="FocusColor" + mouse_wheel_opaque="true" /> </search_combo_box> </panel> <favorites_bar |