diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-11-06 15:09:00 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-11-06 15:09:00 -0500 |
| commit | 6ad37da1aa0ae4130f33943c0f87bbdcf1a69c38 (patch) | |
| tree | 0ae02b9f3839e2eb327e33c1b6f7802a08c843f7 /indra/newview/skins/default/xui/en | |
| parent | bf6d1670756ba96abde570e7dbbf94c62c71ca5b (diff) | |
| parent | 379bc7bd1db5a728a730f7e0e7d0a3bfbdfc3870 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_login.xml | 11 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 9c96143aa3..134ca75018 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -31,6 +31,7 @@ width="996"/> <layout_stack animate="false" + clip="false" follows="left|bottom|right" name="login_widgets" layout="topleft" @@ -68,12 +69,16 @@ width="150"> Username: </text> + <!-- STEAM-14: Turn off commit_on_focus_lost so if user presses Enter + with focus in this combo_box, we can use commit action to initiate + login --> <combo_box allow_text_entry="true" follows="left|bottom" height="22" left_delta="0" max_chars="128" + commit_on_focus_lost="false" combo_editor.prevalidate_callback="ascii" tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine" top_pad="0" @@ -96,6 +101,9 @@ width="150"> Password: </text> + <!-- STEAM-14: Turn off commit_on_focus_lost so if user presses Enter + with focus in this line_editor, we can use commit action to + initiate login --> <line_editor follows="left|bottom" height="22" @@ -103,6 +111,7 @@ name="password_edit" is_password="true" select_on_focus="true" + commit_on_focus_lost="false" top_pad="0" width="135" /> </layout_panel> @@ -223,7 +232,7 @@ follows="right|bottom" name="links" width="210" - min_width="210" + min_width="100" height="80"> <text follows="right|bottom" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 15eb46c348..2157a05bbf 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -59,7 +59,7 @@ <string name="LoginFailedNoNetwork">Network error: Could not establish connection, please check your network connection.</string> <string name="LoginFailed">Login failed.</string> <string name="Quit">Quit</string> - <string name="create_account_url">http://join.secondlife.com/</string> + <string name="create_account_url">http://join.secondlife.com/?sourceid=[sourceid]</string> <string name="LoginFailedViewerNotPermitted"> The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer: |