diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-08-31 11:51:38 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-08-31 11:51:38 -0700 |
| commit | 2154bccdc4ef79bc2d593daad85d1344e9177bcf (patch) | |
| tree | df202d7f19616648be5680ff145fd281c5d21f69 /indra/newview/skins/default/xui/en/panel_login.xml | |
| parent | e62a4d4ec151e81f4dc68b29a009596d3d154d57 (diff) | |
| parent | 09394d3a9d72c701fe28c54d7c76d71ddf3ef765 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_login.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_login.xml | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 83f1bff91f..983f93cb03 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -117,17 +117,33 @@ label="Remember password" name="connect_btn" top="35" width="90" /> - <!-- Utf code in label is a filled up-pointing triangle --> - <menu_button - left_pad="5" - top="35" - width="80" + <text + follows="left|bottom" + font="SansSerifSmall" + height="15" + left_pad="10" + name="mode_selection_text" + top="20" + width="130"> + Mode: + </text> + <combo_box + follows="left|bottom" height="23" - label="Mode ▲" - name="mode_menu" + max_chars="128" tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features." - menu_filename="menu_mode_change.xml" - /> + top_pad="0" + name="mode_combo" + width="110"> + <combo_box.item + label="Basic" + name="Basic" + value="settings_minimal.xml" /> + <combo_box.item + label="Advanced" + name="Advanced" + value="" /> + </combo_box> <text follows="left|bottom" font="SansSerifSmall" |