diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-08-04 15:34:34 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-08-04 15:34:34 -0700 |
| commit | 33cc363a6813bf6c1268fa85747d1d403e00f8e5 (patch) | |
| tree | d30696b245c4b5eb70575582d0dd9ddc4b20e5c7 /indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
| parent | 89434ef6e64462041368ab26e049011fc84ae1e3 (diff) | |
Merged in latest viewer-2.0.0-3 up through svn r129410. LLFloaterTOS needs some post-merge cleanup.
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml index 45b1e1eb9f..17e9a7beb2 100644 --- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<combo_box font="SansSerifSmall" +<gesture_combo_box font="SansSerifSmall" list_position="below" max_chars="20" follows="right|top"> - <combo_box.combo_button name="Combobox Button" + <gesture_combo_box.combo_button name="Combobox Button" label="" hover_glow_amount="0.15" font="SansSerifSmall" @@ -12,7 +12,7 @@ image_selected="ComboButton_Selected" image_disabled="ComboButton_Disabled" image_disabled_selected="ComboButton_Disabled_Selected" /> - <combo_box.drop_down_button name="Drop Down Button" + <gesture_combo_box.drop_down_button name="Drop Down Button" label="" hover_glow_amount="0.15" font="SansSerifSmall" @@ -22,8 +22,9 @@ image_selected="DropDown_Selected" image_disabled="DropDown_Disabled" image_disabled_selected="DropDown_Disabled_Selected" /> - <combo_box.combo_list bg_writeable_color="white" /> - <combo_box.combo_editor name="Combo Text Entry" + <gesture_combo_box.combo_list bg_writeable_color="MenuDefaultBgColor" /> + <gesture_combo_box.combo_editor name="Combo Text Entry" select_on_focus="true" font="SansSerifSmall" /> -</combo_box> + <gesture_combo_box.item label="Gestures" /> +</gesture_combo_box> |