Remove diamondware and rearrange login panel to be like it is in the default viewer 2 build

1 files changed, 27 insertions, 35 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index ce0a4dd5d0..982ff0fbac 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -48,8 +48,8 @@ auto_resize="false"
 follows="left|bottom"
 name="login"
 layout="topleft"
-width="850"
-min_width="850"
+width="695"
+min_width="695"
 user_resize="false"
 height="80">
 <text
@@ -80,11 +80,12 @@ height="15"
 left_pad="8"
 name="password_text"
 top="20"
-    width="135">
+    width="150">
        Password:
 </text>
 <line_editor
 follows="left|bottom"
+handle_edit_keys_directly="true"
   height="22"
   max_length="16"
 name="password_edit"
@@ -100,14 +101,26 @@ label="Remember password"
   top_pad="3"
   name="remember_check"
  width="135" />
+<button
+  follows="left|bottom"
+  height="23"
+  image_unselected="PushButton_On"
+  image_selected="PushButton_On_Selected"
+  label="Log In"
+  label_color="White"
+  layout="topleft"
+  left_pad="10"
+  name="connect_btn"
+  top="35"
+  width="90" />
   <text
   follows="left|bottom"
   font="SansSerifSmall"
   height="15"
-  left_pad="10"
+  left_pad="18"
   name="start_location_text"
 top="20"
-  width="250">
+  width="130">
        Start at:
  </text>
 <combo_box
@@ -118,7 +131,7 @@ control_name="LoginLocation"
 max_chars="128"
 top_pad="0"
 name="start_location_combo"
-     width="250">
+     width="135">
 <combo_box.item
 label="My last location"
 name="MyLastLocation"
@@ -131,37 +144,16 @@ name="MyHome"
 label="&lt;Type region name&gt;"
 name="Typeregionname"   value="" />
 </combo_box>
-<button
-  height="23"
-  image_unselected="PushButton_On"
-  image_selected="PushButton_On_Selected"
-  label="Log In"
-  label_color="White"
-  layout="topleft"
-  left_pad="10"
-  name="connect_btn"
-  top="35"
-  width="90" />
-  <text
-  follows="left|bottom"
-  font="SansSerifSmall"
-  height="15"
-  left_pad="10"
-  name="start_location_text"
-top="20"
-  width="150">
-       Grid Name:
- </text>
 <combo_box
-follows="left|bottom"
 allow_text_entry="true"
 font="SansSerifSmall"
-height="23"
+   follows="left|right|bottom"
+   height="23"
+layout="topleft"
+top_pad="2"
 name="server_combo"
-top_pad="0"
-width="150"
-max_chars="255"
-visible="false" />
+width="135"
+  visible="false" />
 </layout_panel>
 <layout_panel
 follows="right|bottom"
@@ -191,7 +183,7 @@ height="16"
 name="forgot_password_text"
 top_pad="12"
 right="-10"
-  width="215">
+  width="180">
        Forgot your name or password?
 </text>
 <text
@@ -203,7 +195,7 @@ height="16"
 name="login_help"
 top_pad="2"
 right="-10"
-    width="220">
+    width="180">
        Need help logging in?   </text>
 <!--  <text
     follows="right|bottom"