diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-08-05 16:10:15 -0400 |
| commit | 07129bf928f79246849e66b396fab44a7a228216 (patch) | |
| tree | e4e19b342540450ff84dad75f90d5acb5b3d6269 /indra/newview/skins/default/xui/en/floater_test_widgets.xml | |
| parent | 03ebc43132331b9a8dcb3c418ec9c319a6beddda (diff) | |
| parent | dc62495da6e5c153c0df57fdbce6b0f40c0208f2 (diff) | |
Merge recent changes
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_test_widgets.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_test_widgets.xml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml index 9a2602db75..c6c561b497 100644 --- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml +++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml @@ -126,8 +126,10 @@ tool_tip="combo box" name="test_combo_box"> <combo_box.item + name="item1" label="Combobox Item 1" /> <combo_box.item + name="item2" label="Combobox Item 2" /> </combo_box> <!-- "icon" is a read-only image. The image_name must match an entry @@ -154,9 +156,9 @@ width="200"> Line Editor Sample Text </line_editor> - <!-- "search_editor" is a specialized line_editor that shows read-only + <!-- "filter_editor" is a specialized line_editor that shows read-only help text until the user clicks in the widget. --> - <search_editor + <filter_editor follows="left|top|right" height="20" label="Type here to search" @@ -228,11 +230,11 @@ tool_tip="scroll list" layout="topleft"> <scroll_list.columns - dynamicwidth="true" + dynamic_width="true" name="first_column" label="Column A"/> <scroll_list.columns - dynamicwidth="true" + dynamic_width="true" name="second_column" label="Column B"/> </scroll_list> |