diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-08 16:07:52 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-08 16:07:52 -0800 |
| commit | 0bc84cea2e81292af45645ad3e3a87d7606aacb1 (patch) | |
| tree | 622ed5ddaf52d558a447ab9a5a748bfda8e4dcda | |
| parent | 7dc7754ed3de9ed621e2ea3964cea972fbf7b27b (diff) | |
| parent | 513fdff9cd8969d7351016902d8304306f739f4e (diff) | |
STORM-990 : pull into viewer-development
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_places.xml | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index c02c6dba1f..d7b75adaef 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 f423dbb91c..daf571297f 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" |