diff options
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_login.xml | 128 |
1 files changed, 41 insertions, 87 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index a258a874b0..c69d5cdbca 100755 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -30,7 +30,7 @@ auto_resize="false" follows="left|right|top" name="ui_container" - width="960" + width="1000" left="0" top="0" height="172"> @@ -75,69 +75,28 @@ select_on_focus="true" commit_on_focus_lost="false" bottom_delta="0" - width="200" /> - <check_box - control_name="RememberPassword" - follows="left|top" - font="SansSerifMedium" - left_pad="20" - bottom_delta="-14" - height="24" - label="Remember me" - check_button.bottom="3" - name="remember_check" - width="145" /> - <text - follows="left|top" - font="SansSerifMedium" - text_color="EmphasisColor" - height="16" - name="forgot_password_text" - left_delta="0" - bottom_delta="16" - width="200"> - Forgotten password - </text> - <button - follows="left|top" - image_unselected="PushButton_Login" - image_pressed="PushButton_Login_Pressed" - image_hover="PushButton_Login_Over" - label="Log In" - label_color="White" - font="SansSerifMedium" - name="connect_btn" - enabled="true" - left="0" - width="80" - height="26" - bottom_delta="44" /> - <text - follows="left|top" - font="SansSerifLarge" - height="24" - name="At_My_Last_Location_Label" - left_pad="8" - bottom_delta="1" - width="120"> - at last location - </text> + width="165" /> <combo_box + allow_text_entry="true" control_name="NextLoginLocation" follows="left|top" label="My favorite places" - height="26" + height="32" max_chars="128" combo_editor.font="SansSerifMedium" - left_pad="20" + left_pad="15" bottom_delta="0" name="start_location_combo" width="175" combo_button.scale_image="true"> <combo_box.item + label="My last location" + name="MyLastLocation" + value="last" /> + <combo_box.item label="My home" name="MyHome" - value="home" /> + value="home" /> </combo_box> <button follows="left|top" @@ -146,38 +105,12 @@ image_hover="PushButton_Login_Over" label="Log In" label_color="White" - font="SansSerifMedium" - name="connect_favorite_btn" - left_pad="8" - width="80" - enabled="false" - height="26" - bottom_delta="0" /> - <line_editor - follows="left|top" - width="170" - height="26" - left_pad="40" - text_pad_left="8" - name="location_edit" - label="Type a location" - font="SansSerifMedium" - select_on_focus="true" - commit_on_focus_lost="false" - bottom_delta="0" /> - <button - follows="left|top" - image_unselected="PushButton_Login" - image_pressed="PushButton_Login_Pressed" - image_hover="PushButton_Login_Over" - label="Log In" - enabled="false" - label_color="White" - font="SansSerifMedium" - name="connect_location_btn" - left_pad="8" - width="80" - height="26" + font="SansSerifBold" + name="connect_btn" + enabled="true" + width="120" + height="32" + left_pad="15" bottom_delta="0" /> <combo_box allow_text_entry="false" @@ -186,14 +119,35 @@ height="26" max_chars="128" label="Select grid" - left_pad="40" + left_pad="15" bottom_delta="0" layout="topleft" - top_pad="2" name="server_combo" width="128" /> - </layout_panel> - <layout_panel + <check_box + control_name="RememberPassword" + follows="left|top" + font="SansSerifMedium" + left="185" + bottom_delta="21" + height="24" + label="Remember me" + check_button.bottom="3" + name="remember_check" + width="145" /> + <text + follows="left|top" + font="SansSerifMedium" + text_color="EmphasisColor" + height="16" + name="forgot_password_text" + left="419" + bottom_delta="0" + width="200"> + Forgotten password + </text> + </layout_panel> + <layout_panel height="172" auto_resize="true" name="ui_elastic_pad_right" |