diff --git a/doc/contributions.txt b/doc/contributions.txt index c02c6dba1fc3bef124b593a029d71ae33c8c501b..d7b75adaef6d2477de3bdd1ff788d545262fc295 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -405,6 +405,7 @@ Jonathan Yap STORM-980 VWR-17801 VWR-24347 + STORM-990 Kage Pixel VWR-11 Ken March diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index f423dbb91cf93ef61cb758a0e5a1d1deff080150..daf571297f29f9a6bf74a02494c7fc2ff9fe0e85 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -214,10 +214,9 @@ background_visible="true" <menu_button follows="bottom|left|right" height="23" - image_disabled="ComboButton_Off" - image_unselected="ComboButton_Off" - image_pressed="ComboButton_Off" - image_pressed_selected="ComboButton_Off" + image_disabled="ComboButton_UpOff" + image_unselected="ComboButton_UpOff" + image_selected="ComboButton_UpSelected" layout="topleft" mouse_opaque="false" name="overflow_btn"