diff options
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_login.xml | 40 | ||||
| -rw-r--r-- | indra/newview/skins/minimal/xui/en/panel_login.xml | 110 |
2 files changed, 96 insertions, 54 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 806182bcb4..9782c23751 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -47,8 +47,8 @@ auto_resize="false" follows="left|bottom" name="login" layout="topleft" -width="695" -min_width="695" +width="705" +min_width="705" user_resize="false" height="80"> <text @@ -67,8 +67,7 @@ follows="left|bottom" height="22" left_delta="0" max_chars="128" -prevalidate_callback="ascii" -select_on_focus="true" +combo_editor.prevalidate_callback="ascii" tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine" top_pad="0" name="username_combo" @@ -118,13 +117,40 @@ label="Remember password" name="connect_btn" top="35" width="90" /> + <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" + max_chars="128" + top_pad="0" + control_name="SessionSettingsFile" + name="mode_combo" + width="110"> +<combo_box.item + label="Basic (Default)" + name="Basic" + value="settings_minimal.xml" /> +<combo_box.item + label="Advanced" + name="Advanced" + value="" /> +</combo_box> <text follows="left|bottom" font="SansSerifSmall" height="15" - left_pad="18" + left_pad="8" name="start_location_text" -top="20" + top="20" width="130"> Start at: </text> @@ -136,7 +162,7 @@ control_name="NextLoginLocation" max_chars="128" top_pad="0" name="start_location_combo" - width="170"> + width="165"> <combo_box.item label="My last location" name="MyLastLocation" diff --git a/indra/newview/skins/minimal/xui/en/panel_login.xml b/indra/newview/skins/minimal/xui/en/panel_login.xml index 74f985b9ec..8865f8fbc8 100644 --- a/indra/newview/skins/minimal/xui/en/panel_login.xml +++ b/indra/newview/skins/minimal/xui/en/panel_login.xml @@ -5,18 +5,14 @@ height="600" layout="topleft" left="0" name="panel_login" -top="600" focus_root="true" +top="600" width="996"> <panel.string name="create_account_url"> http://join.secondlife.com/ </panel.string> -<panel.string - name="real_url" translate="false"> - http://secondlife.com/app/login/ -</panel.string> - <string name="reg_in_client_url" translate="false"> +<string name="reg_in_client_url" translate="false"> http://secondlife.eniac15.lindenlab.com/reg-in-client/ </string> <panel.string @@ -33,10 +29,11 @@ bottom="600" follows="all" hide_loading="true" left="0" -name="login_html_" -start_url="http://upload.wikimedia.org/wikipedia/commons/3/37/Daylighting_-_Skylight.jpg" -height="695" - width="996" /> +name="login_html" +start_url="" +top="0" +height="600" + width="980" /> <layout_stack follows="left|bottom|right" name="login_widgets" @@ -70,8 +67,7 @@ Username: height="22" left_delta="0" max_chars="128" - prevalidate_callback="ascii" - select_on_focus="true" + combo_editor.prevalidate_callback="ascii" tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine" top_pad="0" name="username_combo" @@ -85,7 +81,7 @@ Username: follows="left|bottom" font="SansSerifSmall" height="15" -left_pad="8" +left_pad="-19" name="password_text" top="20" width="150"> @@ -126,63 +122,83 @@ label="Remember password" font="SansSerifSmall" height="15" left_pad="18" - name="start_location_text" + name="mode_selection_text" top="20" width="130"> - Start at: + Mode: </text> <combo_box -allow_text_entry="true" -control_name="LoginLocation" follows="left|bottom" height="23" -max_chars="128" -top_pad="0" -name="start_location_combo" - width="170"> -<combo_box.item -label="My last location" -name="MyLastLocation" - value="last" /> + max_chars="128" + top_pad="0" + control_name="SessionSettingsFile" + name="mode_combo" + width="120"> <combo_box.item -label="My home" -name="MyHome" - value="home" /> + label="Basic (Default)" + name="Basic" + value="settings_minimal.xml" /> <combo_box.item -label="<Type region name>" -name="Typeregionname" value="" /> + label="Advanced" + name="Advanced" + value="" /> </combo_box> -<combo_box -allow_text_entry="true" -font="SansSerifSmall" - follows="left|right|bottom" - height="23" - max_chars="256" -layout="topleft" -top_pad="2" -name="server_combo" -width="135" - visible="false" /> </layout_panel> <layout_panel tab_stop="false" follows="right|bottom" name="links" -width="200" -min_width="200" +width="205" +min_width="205" user_resize="false" height="80"> + <text +follows="right|bottom" +font="SansSerifSmall" +text_color="EmphasisColor" +halign="right" +height="16" +top="12" +right="-10" +name="create_new_account_text" + width="200"> + Sign up + </text> +<text +follows="right|bottom" +font="SansSerifSmall" +text_color="EmphasisColor" +halign="right" +height="16" +name="forgot_password_text" +top_pad="12" +right="-10" + width="200"> + Forgot your username or password? +</text> <text +follows="right|bottom" +font="SansSerifSmall" +text_color="EmphasisColor" +halign="right" +height="16" +name="login_help" +top_pad="2" +right="-10" + width="200"> + Need help logging in? </text> +<!-- <text follows="right|bottom" - font="SansSerifLarge" + font="SansSerifSmall" halign="right" height="28" - top_pad="12" + top_pad="2" name="channel_text" width="180" word_wrap="true"> - Skylight FTW! - </text> + [VERSION] + </text>--> </layout_panel> </layout_stack> </panel> |