summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_login.xml
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-04-02 02:03:21 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-04-02 02:03:21 -0700
commit9523c70f9dd3b2db21f6578bbb2b1da6873004ea (patch)
treefe3f862878af5793aeec797d63c1d7c114d3c68d /indra/newview/skins/default/xui/en/panel_login.xml
parent18d9efff12ef8b59c648a801fe2c5c7e0bc8fde4 (diff)
parentaa0a129b6798f8be554d1d9d41cbd217a0040daf (diff)
DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunk
Includes: DEV-45800, DEV-45803 - Grid Manager DEV-45804 - SLURL refactor DEV-45801 - Single username field (for Identity Evolution and SLE Ldap) Also, Includes Certificate Management code allowing the viewer to connect to grids not signed by a well know key (just like any web browser). Also contains secure storage for things like passwords. The security/certificate code is modular with the intention of adding modules to directly use the operating system facilities for crypto if available. (that's much more secure than we'll ever be) Also, refactor of voice to modularize it, and add a diamondware voice module. CR: Aimee, James, Lynx, Mani, Karina and a list of thousands
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_login.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_login.xml88
1 files changed, 39 insertions, 49 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 01adc00e1a..539c5f785c 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -48,50 +48,31 @@ auto_resize="false"
follows="left|bottom"
name="login"
layout="topleft"
-width="695"
-min_width="695"
+width="850"
+min_width="850"
user_resize="false"
height="80">
<text
follows="left|bottom"
font="SansSerifSmall"
height="16"
-name="first_name_text"
+name="username_text"
top="20"
left="20"
width="150">
-First name:
+Username:
</text>
<line_editor
follows="left|bottom"
height="22"
-label="First"
+label="Username"
left_delta="0"
max_length="31"
-name="first_name_edit"
+name="username_edit"
select_on_focus="true"
-tool_tip="[SECOND_LIFE] First Name"
+tool_tip="[SECOND_LIFE] Username"
top_pad="0"
- width="135" />
- <text
- follows="left|bottom"
- font="SansSerifSmall"
- height="16"
- left_pad="8"
- name="last_name_text"
- top="20"
- width="150">
- Last name: </text>
-<line_editor
-follows="left|bottom"
-height="22"
-label="Last"
-max_length="31"
-name="last_name_edit"
-select_on_focus="true"
-tool_tip="[SECOND_LIFE] Last Name"
- top_pad="0"
- width="135" />
+width="150" />
<text
follows="left|bottom"
font="SansSerifSmall"
@@ -99,7 +80,7 @@ height="15"
left_pad="8"
name="password_text"
top="20"
- width="150">
+ width="135">
Password:
</text>
<line_editor
@@ -119,26 +100,14 @@ 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="18"
+ left_pad="10"
name="start_location_text"
top="20"
- width="130">
+ width="250">
Start at:
</text>
<combo_box
@@ -149,7 +118,7 @@ control_name="LoginLocation"
max_chars="128"
top_pad="0"
name="start_location_combo"
- width="135">
+ width="250">
<combo_box.item
label="My last location"
name="MyLastLocation"
@@ -162,16 +131,37 @@ 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"
- follows="left|right|bottom"
- height="23"
-layout="topleft"
-top_pad="2"
+height="23"
name="server_combo"
-width="135"
- visible="false" />
+top_pad="0"
+width="150"
+max_chars="255"
+visible="false" />
</layout_panel>
<layout_panel
follows="right|bottom"