From a6c0e4e71de033c8e6798c867c8526261fc96e66 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 12 Jan 2010 16:32:32 -0800
Subject: Change login screen to single "SLID" input field. Use last name
 "Resident" if none provided. Reviewed with Huseby

---
 indra/newview/skins/default/xui/en/panel_login.xml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index df942b1a26..30506dcde4 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -60,7 +60,7 @@ name="first_name_text"
 top="20"
 left="20"
 width="150">
-First name:
+  Second Life ID:
 </text>
 <line_editor
 follows="left|bottom"
@@ -69,20 +69,23 @@ height="22"
 label="First"
 left_delta="0"
 max_length="31"
-name="first_name_edit"
+name="login_id_edit"
+prevalidate_callback="ascii" 
 select_on_focus="true"
-tool_tip="[SECOND_LIFE] First Name"
+tool_tip="[SECOND_LIFE] ID"
 top_pad="0"
-   width="135" />
+   width="200" />
   <text
    follows="left|bottom"
    font="SansSerifSmall"
    height="16"
-   left_pad="8"
+   left="230"
    name="last_name_text"
    top="20"
+   visible="false" 
    width="150">
-    Last name:   </text>
+    Last name:
+  </text>
 <line_editor
 follows="left|bottom"
 handle_edit_keys_directly="true"
@@ -93,12 +96,13 @@ name="last_name_edit"
 select_on_focus="true"
 tool_tip="[SECOND_LIFE] Last Name"
   top_pad="0"
+  visible="false" 
   width="135" />
 <text
 follows="left|bottom"
 font="SansSerifSmall"
 height="15"
-left_pad="8"
+left="230"
 name="password_text"
 top="20"
     width="150">
-- 
cgit v1.2.3


From 301f250c1cd77711c0234d8ed4089453712f834e Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 10 Feb 2010 12:04:26 -0800
Subject: Mini-inspectors show both display name and SLID

---
 indra/newview/skins/default/xui/en/panel_login.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index cf119c9ab6..2777b641c9 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -60,7 +60,7 @@ name="first_name_text"
 top="20"
 left="20"
 width="150">
-  Second Life ID:
+  Second Life Name or ID:
 </text>
 <line_editor
 follows="left|bottom"
-- 
cgit v1.2.3


From 42606dbbb5f452211e4fc30ee0ed41334fc14e8d Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Fri, 5 Mar 2010 17:06:22 -0800
Subject: Change login screen to use "Username"

---
 indra/newview/skins/default/xui/en/panel_login.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 20f91d85ab..bf839f13e5 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -60,7 +60,7 @@ name="first_name_text"
 top="20"
 left="20"
 width="150">
-  Second Life Name or ID:
+  Username or First Last:
 </text>
 <line_editor
 follows="left|bottom"
-- 
cgit v1.2.3


From 5f9dd335e6449c85d19b44166ad57b3793922b80 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 8 Mar 2010 13:38:58 -0800
Subject: Login screen says "Second Life ID", not username, per discussion with
 Erica

---
 indra/newview/skins/default/xui/en/panel_login.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index bf839f13e5..617fea6539 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -60,7 +60,7 @@ name="first_name_text"
 top="20"
 left="20"
 width="150">
-  Username or First Last:
+  Second Life ID or Name:
 </text>
 <line_editor
 follows="left|bottom"
-- 
cgit v1.2.3


From dbc22bea7bba0c903a5090b24814f97b61a604b6 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 10 Mar 2010 17:12:09 -0800
Subject: Example logins in ghost text

---
 indra/newview/skins/default/xui/en/panel_login.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 617fea6539..46f3049c4e 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -66,7 +66,7 @@ width="150">
 follows="left|bottom"
 handle_edit_keys_directly="true"
 height="22"
-label="First"
+label="e.g. bobsmith12 or Stellar Sunshine"
 left_delta="0"
 max_length="31"
 name="login_id_edit"
-- 
cgit v1.2.3


From 0a249b25b993f004ce05d48f7bce7988d398eb03 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 28 Apr 2010 17:02:16 -0700
Subject: Login input field allows legacy first+last name > 31 chars

Previously if you had a super-long first name, you couldn't log in!
---
 indra/newview/skins/default/xui/en/panel_login.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 9690561d5d..f435644ec9 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -68,7 +68,7 @@ handle_edit_keys_directly="true"
 height="22"
 label="e.g. bobsmith12 or Stellar Sunshine"
 left_delta="0"
-max_length="31"
+max_length="63"
 name="login_id_edit"
 prevalidate_callback="ascii" 
 select_on_focus="true"
-- 
cgit v1.2.3


From 73a53aa64328f1b48fa09286120609b7297985e3 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 17 May 2010 09:13:46 -0700
Subject: DEV-50013 Rename "SLID" to "Username" at Product's request

---
 indra/newview/skins/default/xui/en/panel_login.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 21846f6e87..88c264c649 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -60,7 +60,7 @@ name="username_text"
 top="20"
 left="20"
 width="150">
-Second Life ID or Name:
+Username:
 </text>
 <line_editor
 follows="left|bottom"
-- 
cgit v1.2.3


From ccc4fbdb1db0ca79b18e9e7f9ba1c2a8d812e5c8 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 19 May 2010 12:31:57 -0700
Subject: DEV-50263 "Username" hovertip still mentions "Second Life ID"

Now refers to Username.  Also checked with Char to make sure
it's OK to refer to Steller Sunshine (she's fine with it) and
fixed the spelling of "Steller"
---
 indra/newview/skins/default/xui/en/panel_login.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 88c264c649..5a671ac78a 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -65,13 +65,13 @@ Username:
 <line_editor
 follows="left|bottom"
 height="22"
-label="bobsmith12 or Stellar Sunshine"
+label="bobsmith12 or Steller Sunshine"
 left_delta="0"
 max_length="63"
 name="username_edit"
 prevalidate_callback="ascii" 
 select_on_focus="true"
-tool_tip="[SECOND_LIFE] ID, like bobsmith12 or Stellar Sunshine"
+tool_tip="The username you chose when you registered, like bobsmith12 or Steller Sunshine"
 top_pad="0"
 width="150" />
 <text
-- 
cgit v1.2.3


From b62d1472be7e64c176ea663562d8747f46ace316 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 19 May 2010 12:35:22 -0700
Subject: DEV-50265 Login screen should say "Forgot your username or password?"

---
 indra/newview/skins/default/xui/en/panel_login.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 5a671ac78a..14759ad731 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -186,7 +186,7 @@ name="forgot_password_text"
 top_pad="12"
 right="-10"
   width="180">
-       Forgot your name or password?
+       Forgot your username or password?
 </text>
 <text
 follows="right|bottom"
-- 
cgit v1.2.3


From 2c87657659eb6cdd0a0f135b78d290ed180cc21d Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Wed, 19 May 2010 16:38:50 -0700
Subject: DEV-50265 Fix clipping of "Forgot your username or password?"

---
 indra/newview/skins/default/xui/en/panel_login.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/panel_login.xml')

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 14759ad731..0f97301856 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -160,8 +160,8 @@ width="135"
 <layout_panel
 follows="right|bottom"
 name="links"
-width="200"
-min_width="200"
+width="205"
+min_width="205"
 user_resize="false"
 height="80">
    <text
@@ -173,7 +173,7 @@ height="16"
 top="12"
 right="-10"
 name="create_new_account_text"
-  width="180">
+  width="200">
        Sign up
  </text>
 <text
@@ -185,7 +185,7 @@ height="16"
 name="forgot_password_text"
 top_pad="12"
 right="-10"
-  width="180">
+  width="200">
        Forgot your username or password?
 </text>
 <text
@@ -197,7 +197,7 @@ height="16"
 name="login_help"
 top_pad="2"
 right="-10"
-    width="180">
+    width="200">
        Need help logging in?   </text>
 <!--  <text
     follows="right|bottom"
-- 
cgit v1.2.3