Combine the three ways of entering the users name on the login window.

Sort them all out later.  This is at least one consistnant login panel skin.

1 files changed, 52 insertions, 39 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
index f43fc7a..35ecc6e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml
@@ -29,45 +29,24 @@
                 http://secondlife.com/account/request.php
         </string>
 
-
-  <!-- START LOCATION -->
-
-        <text name="start_location_text" 
-              bottom="8" left="10" height="16" right="115"
-        follows="left|bottom" h_pad="0" halign="right" v_pad="0"
-        bg_visible="false" drop_shadow_visible="true"
-        border_visible="false" border_drop_shadow_visible="false"
-              font="SansSerifSmall" mouse_opaque="true">
-                Start location:
-        </text>
-        <combo_box name="start_location_combo"
-             bottom_delta="2" left="120" height="16" width="150"
-             follows="left|bottom" font="SansSerifSmall"
-             mouse_opaque="true" allow_text_entry="true" max_chars="128">
-                <combo_item name="MyHome" value="My Home">
-                        My Home
-                </combo_item>
-                <combo_item name="MyLastLocation" value="My Last Location">
-                        My Last Location
-                </combo_item>
-                <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
-                        &lt;Type region name&gt;
-                </combo_item>
-        </combo_box>
-
-
   <!-- FIRST NAME -->
 
         <text name="first_name_text" 
-              bottom="56" left="24" height="16" width="120"
+              bottom="48" left="24" height="16" width="120"
         follows="left|bottom" h_pad="0" halign="left" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
               font="SansSerif" mouse_opaque="true">
                 First name:
         </text>
+<!--
+        <combo_box bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-24"
+             follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true" height="20" left_delta="0"
+       max_chars="31" mouse_opaque="true" name="first_name_combo"
+       select_all_on_focus_received="true" width="120" allow_text_entry="true" allow_translate="false" />
+-->
         <line_editor name="first_name_edit" 
-               bottom_delta="-20" left_delta="0" height="20" width="120"
+               bottom_delta="-24" left_delta="0" height="20" width="120"
                follows="left|bottom" font="SansSerif"
                bevel_style="in" border_style="line" border_thickness="1" 
                max_length="31" mouse_opaque="true"
@@ -75,11 +54,10 @@
                select_all_on_focus_received="true"
                allow_translate="false" />
 
-
   <!-- LAST NAME -->
 
         <text name="last_name_text" 
-              bottom_delta="20" left_delta="130" height="16" width="120"
+              bottom_delta="24" left_delta="130" height="16" width="120"
         follows="left|bottom" h_pad="0" halign="left" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -87,7 +65,7 @@
                 Last name:
         </text>
         <line_editor name="last_name_edit" 
-               bottom_delta="-20" left_delta="0" height="20" width="120"
+               bottom_delta="-24" left_delta="0" height="20" width="120"
                follows="left|bottom" font="SansSerif"
                bevel_style="in" border_style="line" border_thickness="1" 
                max_length="31" mouse_opaque="true"
@@ -99,7 +77,7 @@
   <!-- PASSWORD -->
 
         <text name="password_text" 
-              bottom_delta="20" left_delta="130" height="16" width="120"
+              bottom_delta="24" left_delta="130" height="16" width="120"
         follows="left|bottom" h_pad="0" halign="left" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -107,23 +85,57 @@
                 Password:
         </text>
         <line_editor name="password_edit" 
-               bottom_delta="-20" left_delta="0" height="20" width="120"
+               bottom_delta="-24" left_delta="0" height="20" width="120"
                follows="left|bottom" font="SansSerif"
                bevel_style="in" border_style="line" border_thickness="1" 
                max_length="16" mouse_opaque="true"
                      handle_edit_keys_directly="true"
                select_all_on_focus_received="true"
                allow_translate="false" />
+
+
+  <!-- ACCOUNT CHECK BOXES -->
+
+        <check_box control_name="RememberName"
+         follows="left|bottom" font="SansSerifSmall" height="16"
+             initial_value="true" label="Remember account name"
+             bottom_delta="-24" left="24" mouse_opaque="true" name="remember_name_check" width="158" />
         <check_box name="remember_check" label="Remember password"
-             bottom_delta="-24" left_delta="0" height="16" width="140"
+             bottom_delta="0" left_delta="260" height="16" width="140"
              follows="left|bottom" font="SansSerifSmall" control_name="RememberPassword" 
                    initial_value="false" mouse_opaque="true"  />
 
 
+  <!-- START LOCATION -->
+
+        <text name="start_location_text" 
+              bottom="48" left_delta="150" height="16"
+        follows="left|bottom" h_pad="0" halign="left" v_pad="0"
+        bg_visible="false" drop_shadow_visible="true"
+        border_visible="false" border_drop_shadow_visible="false"
+              font="SansSerifSmall" mouse_opaque="true">
+                Start location:
+        </text>
+        <combo_box name="start_location_combo"
+             bottom_delta="-24" left_delta="0" height="20" width="150"
+             follows="left|bottom" font="SansSerifSmall"
+             mouse_opaque="true" allow_text_entry="true" max_chars="128">
+                <combo_item name="MyHome" value="My Home">
+                        My Home
+                </combo_item>
+                <combo_item name="MyLastLocation" value="My Last Location">
+                        My Last Location
+                </combo_item>
+                <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
+                        &lt;Type region name&gt;
+                </combo_item>
+        </combo_box>
+
+
   <!-- GRIDS -->
 
         <text name="grid_text" 
-              bottom="56" left_delta="150" height="16" width="120"
+              bottom="48" left_delta="160" height="16" width="120"
         follows="left|bottom" h_pad="0" halign="left" v_pad="0"
         bg_visible="false" drop_shadow_visible="true"
         border_visible="false" border_drop_shadow_visible="false"
@@ -131,11 +143,11 @@
                 Grid:
         </text>
         <combo_box name="server_combo"
-             bottom_delta="-20" left_delta="0" height="20" width="120"
+             bottom_delta="-24" left_delta="0" height="20" width="120"
              follows="left|bottom" allow_text_entry="false"
              max_chars="20" mouse_opaque="true" />
         <button name="grid_btn" label="Grid Manager"
-          bottom_delta="-24" left_delta="10" height="16" width="100"
+          bottom_delta="-24" left_delta="0" height="20" width="100"
           follows="left|bottom" font="SansSerifSmall" halign="center"
                       mouse_opaque="true" scale_image="TRUE" />
 
@@ -143,11 +155,12 @@
   <!-- LOG IN -->
 
         <button name="connect_btn" label="Log In"
-          bottom="34" left_delta="140" height="24" width="120"
+          bottom="24" left_delta="140" height="24" width="120"
           follows="left|bottom" font="SansSerif" halign="center"
                 mouse_opaque="true" scale_image="TRUE" />
 
 
+  <!-- Yes, this is getting messy, with three different ways of doing the username.  sigh -->
   <!-- SL USERNAME -->
 
   <text name="username_text"