1 files changed, 142 insertions, 73 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 ed89977..5b2f3ad 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
@@ -1,56 +1,35 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="0" follows="left|top|right|bottom" height="600" left="0"
-     mouse_opaque="true" name="panel_login" width="800">
-        <web_browser border_visible="false" bottom="0" follows="top|left|bottom|right" left="0"
-             name="login_html" right="-1"
-             start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
-             top="-1" />
+
+<panel name="panel_login" 
+       bottom="0" left="0" height="600" width="800"
+       follows="left|top|right|bottom" mouse_opaque="true" >
+
+        <web_browser name="login_html" 
+               bottom="0" top="-1" left="0" right="-1"
+               border_visible="false" follows="top|left|bottom|right"
+                     start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E" />
         <string name="real_url">
                 http://secondlife.com/app/login/
         </string>
         <string name="forgot_password_url">
                 http://secondlife.com/account/request.php
         </string>
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="54" drop_shadow_visible="true" follows="left|bottom"
-             font="SansSerif" h_pad="0" halign="left" height="16"
-             left="32" mouse_opaque="true" name="first_name_text" v_pad="0" width="120">
-                First Name:
-        </text>
-        <line_editor 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="32" max_length="31" mouse_opaque="true"
-             name="first_name_edit" select_all_on_focus_received="true" width="120" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="54" drop_shadow_visible="true" follows="left|bottom"
-             font="SansSerif" h_pad="0" halign="left" height="16"
-             left="164" mouse_opaque="true" name="last_name_text" v_pad="0" width="120">
-                Last Name:
-        </text>
-        <line_editor 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="164" max_length="31" mouse_opaque="true"
-             name="last_name_edit" select_all_on_focus_received="true" width="120" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="54" drop_shadow_visible="true" follows="left|bottom"
-             font="SansSerif" h_pad="0" halign="left" height="16"
-             left="296" mouse_opaque="true" name="password_text" v_pad="0" width="120">
-                Password:
-        </text>
-        <line_editor 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="296" max_length="16" mouse_opaque="true"
-             name="password_edit" select_all_on_focus_received="true" width="120" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="10" drop_shadow_visible="true" follows="left|bottom"
-             font="SansSerif" h_pad="0" halign="left" height="16"
-             left="32" mouse_opaque="true" name="start_location_text" v_pad="0"
-             width="95">
+
+
+  <!-- START LOCATION -->
+
+        <text name="start_location_text" 
+              bottom="8" left="24" height="16" width="95"
+        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 allow_text_entry="true" bottom="8" follows="left|bottom" height="18"
-             left_delta="97" max_chars="128" mouse_opaque="true"
-             name="start_location_combo" width="155">
+        <combo_box name="start_location_combo"
+             bottom_delta="2" left_delta="100" 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>
@@ -61,39 +40,129 @@
                         &lt;Type region name&gt;
                 </combo_item>
         </combo_box>
-        <check_box bottom="10" follows="left|bottom" font="SansSerifSmall" height="16"
-             initial_value="false" label="Remember password"
-             left_delta="163" mouse_opaque="true" name="remember_check" width="138" />
-        <button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
-             height="24" label="Log In" label_selected="Log In"
-             left="435" mouse_opaque="true" name="connect_btn" scale_image="TRUE"
-             width="120" />
-        <combo_box allow_text_entry="true" bottom="32" follows="left|bottom" height="18"
-             left_delta="135" max_chars="20" mouse_opaque="true"
-             name="server_combo" width="120" />
-        <button bottom="28" follows="left|bottom" font="SansSerif" halign="center"
-                     height="24" label="Grid Manager" label_selected="Connect"
-                     left_delta="195" mouse_opaque="true" name="grid_btn" scale_image="TRUE"
-                     width="120" />
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="45" drop_shadow_visible="true" follows="right|bottom"
-             font="SansSerifSmall" font-style="UNDERLINE" h_pad="0" halign="right" height="16"
-             left="-210" mouse_opaque="true" name="create_new_account_text" v_pad="0" width="200"
-             hover="true" hover_color="50 115 185">
+
+
+  <!-- FIRST NAME -->
+
+        <text name="first_name_text" 
+              bottom="56" 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>
+        <line_editor name="first_name_edit" 
+               bottom_delta="-20" 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" />
+
+
+  <!-- LAST NAME -->
+
+        <text name="last_name_text" 
+              bottom_delta="20" 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"
+              font="SansSerif" mouse_opaque="true">
+                Last Name:
+        </text>
+        <line_editor name="last_name_edit" 
+               bottom_delta="-20" 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" />
+
+
+  <!-- PASSWORD -->
+
+        <text name="password_text" 
+              bottom_delta="20" 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"
+              font="SansSerif" mouse_opaque="true">
+                Password:
+        </text>
+        <line_editor name="password_edit" 
+               bottom_delta="-20" 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" />
+        <check_box name="remember_check" label="Remember password"
+             bottom_delta="-24" left_delta="0" height="16" width="140"
+             follows="left|bottom" font="SansSerifSmall" 
+                   initial_value="false" mouse_opaque="true"  />
+
+
+  <!-- GRIDS -->
+
+        <text name="grid_text" 
+              bottom="56" left_delta="150" 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">
+                Grid:
+        </text>
+        <combo_box name="server_combo"
+             bottom_delta="-20" 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"
+          follows="left|bottom" font="SansSerifSmall" halign="center"
+                      mouse_opaque="true" scale_image="TRUE" />
+
+
+  <!-- LOG IN -->
+
+        <button name="connect_btn" label="Log In"
+          bottom="34" left_delta="140" height="24" width="120"
+          follows="left|bottom" font="SansSerif" halign="center"
+                mouse_opaque="true" scale_image="TRUE" />
+
+
+  <!-- ACCOUNT / FORGOT PASSWORD -->
+
+        <text name="create_new_account_text"
+              bottom="45" left="-210" height="16" width="200"
+        follows="right|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" font-style="UNDERLINE"
+        mouse_opaque="true" hover="true" hover_color="50 115 185">
                 Sign up for account
         </text>
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="25" drop_shadow_visible="true" follows="right|bottom"
-             font="SansSerifSmall" font-style="UNDERLINE" h_pad="0" halign="right" height="16"
-             left="-210" mouse_opaque="true" name="forgot_password_text" v_pad="0" width="200"
-             hover="true" hover_color="50 115 185">
+
+        <text name="forgot_password_text"
+              bottom="25" left="-210" height="16" width="200"
+        follows="right|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" font-style="UNDERLINE"
+        mouse_opaque="true" hover="true" hover_color="50 115 185">
                 Forgot your name or password?
         </text>
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="5" drop_shadow_visible="true" follows="right|bottom"
-             font="SansSerifSmall" h_pad="0" halign="right" height="16"
-             left="-310" mouse_opaque="true" name="channel_text" v_pad="0" width="300"
-             hover="true" hover_color="50 115 185">
+
+
+  <!-- CHANNEL & VERSION -->
+
+        <text name="channel_text"
+              bottom="5" left="-310" height="16" width="300"
+        follows="right|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"
+        hover="true" hover_color="50 115 185">
                 [CHANNEL] [VERSION]
         </text>
 </panel>