summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/textures/textures.xml10
-rw-r--r--indra/newview/skins/default/xui/en/panel_login.xml187
2 files changed, 98 insertions, 99 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 14ce08e260..607b33fbb1 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -53,9 +53,6 @@ with the same filename but different name
<texture name="Arrow_Left" file_name="widgets/Arrow_Left.png" preload="true" />
<texture name="Arrow_Right" file_name="widgets/Arrow_Right.png" preload="true" />
- <texture name="Arrow_Up" file_name="widgets/Arrow_Up.png" preload="true" />
- <texture name="Arrow_Down" file_name="widgets/Arrow_Down.png" preload="true" />
-
<texture name="Arrow_Small_Up" file_name="widgets/Arrow_Small_Up.png" preload="true" />
<texture name="Arrow_Small_Left" file_name="widgets/Arrow_Small_Left.png" preload="true" />
<texture name="Arrow_Small_Right" file_name="widgets/Arrow_Small_Right.png" preload="true" />
@@ -143,7 +140,6 @@ with the same filename but different name
<texture name="DropDown_Over" file_name="widgets/DropDown_Over.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="DropDown_Press" file_name="widgets/DropDown_Press.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="DropDown_Selected" file_name="widgets/DropDown_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
- <texture name="DropDown_On" file_name="widgets/DropDown_On.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="DropDown_Off" file_name="widgets/DropDown_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="DropTarget" file_name="widgets/DropTarget.png" preload="false" />
@@ -404,9 +400,12 @@ with the same filename but different name
<texture name="ProgressBar" file_name="widgets/ProgressBar.png" preload="true" scale.left="4" scale.top="10" scale.right="48" scale.bottom="2" />
<texture name="ProgressTrack" file_name="widgets/ProgressTrack.png" preload="true" scale.left="4" scale.top="13" scale.right="148" scale.bottom="2" />
+ <texture name="PushButton_Disabled" file_name="widgets/PushButton_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
<texture name="PushButton_Off" file_name="widgets/PushButton_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+ <texture name="PushButton_On" file_name="widgets/PushButton_On.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+ <texture name="PushButton_On_Selected" file_name="widgets/PushButton_On_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
+ <texture name="PushButton_On_Disabled" file_name="widgets/PushButton_On_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
<texture name="PushButton_Press" file_name="widgets/PushButton_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
- <texture name="PushButton_Disabled" file_name="widgets/PushButton_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
<texture name="PushButton_Selected" file_name="widgets/PushButton_Selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
<texture name="PushButton_Selected_Press" file_name="widgets/PushButton_Selected_Press.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
<texture name="PushButton_Selected_Disabled" file_name="widgets/PushButton_Selected_Disabled.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
@@ -730,6 +729,7 @@ with the same filename but different name
<texture name="icon_groupnotice.tga" />
<texture name="icon_groupnoticeinventory.tga" />
<texture name="icon_place.tga" />
+ <texture name="icon_place_for_sale.tga" />
<texture name="icon_popular.tga" />
<texture name="icon_top_pick.tga" />
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index a9a02e8fc7..d07d4ea25f 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -6,7 +6,7 @@
left="0"
name="panel_login"
top="600"
- width="800">
+ width="996">
<panel.string
name="create_account_url">
http://join.secondlife.com/
@@ -27,128 +27,79 @@
border_visible="false"
bottom="600"
follows="all"
- hide_loading="true"
+ hide_loading="true"
left="0"
name="login_html"
start_url=""
top="0"
height="600"
- width="800"/>
+ width="996" />
<panel
follows="left|bottom|right"
name="login_widgets"
layout="topleft"
- left="0"
- top="0">
+ top="519"
+ width="996"
+ height="80">
<text
follows="left|bottom"
- font="SansSerif"
+ font="SansSerifSmall"
height="16"
- left="32"
+ left="20"
name="first_name_text"
- top="530"
- width="120">
- First Name:
+ top="20"
+ width="135">
+ Name:
</text>
<line_editor
follows="left|bottom"
- font="SansSerif"
handle_edit_keys_directly="true"
- height="20"
+ height="23"
+ label="First"
left_delta="0"
max_length="31"
name="first_name_edit"
select_on_focus="true"
tool_tip="[SECOND_LIFE] First Name"
- top_pad="2"
- width="120" />
- <text
- follows="left|bottom"
- font="SansSerif"
- height="16"
- left="164"
- name="last_name_text"
- top="530"
- width="120">
- Last Name:
- </text>
+ top_pad="0"
+ width="135" />
<line_editor
follows="left|bottom"
- font="SansSerif"
handle_edit_keys_directly="true"
- height="20"
- left_delta="0"
+ height="23"
+ label="Last"
+ left_pad="8"
max_length="31"
name="last_name_edit"
select_on_focus="true"
tool_tip="[SECOND_LIFE] Last Name"
- top_pad="2"
- width="120" />
- <text
- follows="left|bottom"
- font="SansSerif"
- height="16"
- left="296"
- name="password_text"
- top="530"
- width="120">
- Password:
- </text>
- <line_editor
- follows="left|bottom"
- font="SansSerif"
- handle_edit_keys_directly="true"
- height="20"
- left_delta="0"
- max_length="16"
- name="password_edit"
- select_on_focus="true"
- top_pad="2"
- width="120" />
- <button
- follows="left|bottom"
- height="23"
- label="Log In"
- label_selected="Log In"
- layout="topleft"
- left="425"
- name="connect_btn"
- top="546"
- width="100" />
- <combo_box
- allow_text_entry="true"
- follows="left|bottom"
- height="23"
- layout="topleft"
- left_pad="5"
- name="server_combo"
- width="100" />
+ top_delta="0"
+ width="135" />
<text
follows="left|bottom"
- font="SansSerif"
- height="16"
- left="32"
+ font="SansSerifSmall"
+ height="15"
+ left_pad="8"
name="start_location_text"
- top="576"
- width="95">
- Start location:
+ top="20"
+ width="135">
+ Starting location:
</text>
<combo_box
allow_text_entry="true"
control_name="LoginLocation"
follows="left|bottom"
height="23"
- left_pad="0"
max_chars="128"
+ top_pad="0"
name="start_location_combo"
- top_delta="-2"
- width="155">
+ width="135">
<combo_box.item
- label="My Last Location"
+ label="My last location"
name="MyLastLocation"
value="last" />
<combo_box.item
- label="My Home"
+ label="My home"
name="MyHome"
value="home" />
<combo_box.item
@@ -156,43 +107,91 @@
name="Typeregionname"
value="" />
</combo_box>
+ <combo_box
+ allow_text_entry="true"
+ font="SansSerifSmall"
+ follows="left|bottom"
+ height="23"
+ layout="topleft"
+ top="60"
+ name="server_combo"
+ width="135"
+ visible="false" />
+ <text
+ follows="left|bottom"
+ font="SansSerifSmall"
+ height="15"
+ left_pad="3"
+ name="password_text"
+ top="20"
+ width="135">
+ Password:
+ </text>
+ <line_editor
+ follows="left|bottom"
+ handle_edit_keys_directly="true"
+ height="23"
+ left_delta="0"
+ max_length="16"
+ name="password_edit"
+ select_on_focus="true"
+ top_pad="0"
+ width="135" />
<check_box
control_name="RememberPassword"
follows="left|bottom"
+ font="SansSerifSmall"
height="16"
- label="Remember password"
- left_pad="10"
+ label="Remember"
+ left_pad="5"
name="remember_check"
- top_delta="3"
- width="138" />
+ top_delta="5"
+ width="90" />
+ <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="20"
+ name="connect_btn"
+ top="35"
+ width="90" />
<text
follows="right|bottom"
+ font="SansSerifSmall"
+ text_color="EmphasisColor"
halign="right"
height="16"
- left="-210"
+ top="17"
+ left_pad="10"
+ right="-10"
name="create_new_account_text"
- top="539"
- width="200">
- Create a new account
+ width="180">
+ Sign up for account
</text>
<text
follows="right|bottom"
+ font="SansSerifSmall"
+ text_color="EmphasisColor"
halign="right"
height="16"
- left_delta="0"
name="forgot_password_text"
- top_pad="4"
- width="200">
+ top_pad="2"
+ width="180">
Forgot your name or password?
</text>
<text
follows="right|bottom"
+ font="SansSerifSmall"
halign="right"
- height="16"
- left="-310"
+ height="28"
+ top_pad="2"
name="channel_text"
- top="579"
- width="300">
+ width="180"
+ word_wrap="true">
[VERSION]
</text>
</panel>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 15:06:26 +0000