diff --git a/indra/newview/skins/default/xui/en/accordion_parent.xml b/indra/newview/skins/default/xui/en/accordion_parent.xml
index 914a6eddb9af6c0e91ac19bc4d63c97fd5e61d36..ea34bac0a778832edfca156c48befc6a6a882bbe 100644
--- a/indra/newview/skins/default/xui/en/accordion_parent.xml
+++ b/indra/newview/skins/default/xui/en/accordion_parent.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
- <panel border_thickness="2" name="splitter_parent"
+ <panel border_thickness="0" name="splitter_parent"
background_visible="true"
label="splitter_parent"
title=""
diff --git a/indra/newview/skins/default/xui/en/floater_mute_object.xml b/indra/newview/skins/default/xui/en/floater_mute_object.xml
index 412df1d2626e78f75045e3ff0c7661edad62b2d9..06a03ff340358ba35b21f3340e894c8ddc5b198b 100644
--- a/indra/newview/skins/default/xui/en/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/en/floater_mute_object.xml
@@ -1,56 +1,63 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
can_minimize="false"
- height="140"
+ height="130"
layout="topleft"
- name="mute by name"
+ name="block by name"
help_topic="mute_by_name"
title="Block object by name"
width="375">
<text
type="string"
length="1"
- bottom_delta="50"
follows="top|left"
- font="SansSerif"
+ font="SansSerifLarge"
height="16"
layout="topleft"
- left="20"
- left_delta="25"
- name="message"
- right="380">
- Block by name only affects object chat and IM, not sounds.
-You must type the object's name exactly.
+ left="10"
+ top="25"
+ name="message">
+ Block an object:
</text>
<line_editor
type="string"
length="1"
follows="top|right"
font="SansSerif"
- height="18"
+ height="20"
layout="topleft"
left_delta="0"
name="object_name"
- top_pad="22"
- width="320">
+ top_pad="5"
+ width="350">
Object name
</line_editor>
+ <text
+ type="string"
+ length="1"
+ follows="top|left"
+ font="SansSerifSmall"
+ height="16"
+ layout="topleft"
+ left="30"
+ name="note">
+ * Only blocks object text, not sounds
+ </text>
<button
follows="bottom|left"
- height="20"
+ height="23"
label="Ok"
layout="topleft"
- left="108"
+ left="155"
name="OK"
- top="100"
- width="75" />
+ top_pad="10"
+ width="100" />
<button
follows="bottom|right"
- height="20"
+ height="23"
label="Cancel"
layout="topleft"
- left_pad="7"
+ left_pad="5"
name="Cancel"
- top_delta="0"
- width="75" />
+ width="100" />
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_ui_preview.xml b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
index 2c14b3d87a3c52c570b47870a56a51e47f6991f8..9a3d5aa1835673728b4f381f88e03ee75d564ba5 100644
--- a/indra/newview/skins/default/xui/en/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_ui_preview.xml
@@ -48,8 +48,8 @@
<button
follows="left|top"
height="25"
- label="Display Floater"
- label_selected="Display Floater"
+ label="Show"
+ label_selected="Show"
layout="topleft"
left_pad="10"
name="display_floater"
@@ -60,8 +60,8 @@
enabled="false"
follows="left|top"
height="25"
- label="Close Floater"
- label_selected="Close Floater"
+ label="Hide"
+ label_selected="Hide"
layout="topleft"
left_pad="10"
name="close_displayed_floater"
@@ -71,8 +71,8 @@
<button
follows="left|top"
height="25"
- label="Edit Floater..."
- label_selected="Edit Floater..."
+ label="Edit..."
+ label_selected="Edit..."
layout="topleft"
left_pad="10"
name="edit_floater"
@@ -144,8 +144,7 @@
<button
follows="left|top"
height="25"
- label="Display Floater"
- label_selected="Display Floater"
+ label="Show"
layout="topleft"
left_pad="10"
name="display_floater_2"
@@ -156,8 +155,7 @@
enabled="false"
follows="left|top"
height="25"
- label="Close Floater"
- label_selected="Close Floater"
+ label="Hide"
layout="topleft"
left_pad="10"
name="close_displayed_floater_2"
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index d943b2ea23692a19e6589ebfcce200d763cd3cdd..e7fb3fa208beeb035d2446807556357ba8473dc9 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
- follows="left|top|right|bottom"
+ follows="all"
height="600"
layout="topleft"
left="0"
@@ -22,11 +22,11 @@
<web_browser
border_visible="false"
bottom="600"
- follows="top|left|bottom|right"
+ follows="all"
layout="topleft"
left="0"
name="login_html"
- hide_loading="true"
+ hide_loading="true"
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" />
@@ -44,10 +44,7 @@
First Name:
</text>
<line_editor
- border_style="line"
- border_thickness="1"
follows="left|bottom"
- font="SansSerif"
handle_edit_keys_directly="true"
height="20"
layout="topleft"
@@ -55,8 +52,8 @@
max_length="31"
name="first_name_edit"
select_on_focus="true"
- tool_tip="Enter first name here"
- top_pad="4"
+ tool_tip="Second Life First Name"
+ top_pad="2"
width="120" />
<text
type="string"
@@ -72,8 +69,6 @@
Last Name:
</text>
<line_editor
- border_style="line"
- border_thickness="1"
follows="left|bottom"
font="SansSerif"
handle_edit_keys_directly="true"
@@ -83,7 +78,7 @@
max_length="31"
name="last_name_edit"
select_on_focus="true"
- top_pad="4"
+ top_pad="2"
width="120" />
<text
type="string"
@@ -99,8 +94,6 @@
Password:
</text>
<line_editor
- border_style="line"
- border_thickness="1"
follows="left|bottom"
font="SansSerif"
handle_edit_keys_directly="true"
@@ -110,27 +103,26 @@
max_length="16"
name="password_edit"
select_on_focus="true"
- top_pad="4"
+ top_pad="2"
width="120" />
<button
follows="left|bottom"
- height="24"
+ height="23"
label="Log In"
label_selected="Log In"
layout="topleft"
- left="435"
+ left="425"
name="connect_btn"
- top="548"
- width="120" />
+ top="546"
+ width="100" />
<combo_box
allow_text_entry="true"
follows="left|bottom"
- height="18"
+ height="23"
layout="topleft"
- left_pad="15"
+ left_pad="5"
name="server_combo"
- top_delta="2"
- width="120" />
+ width="100" />
<text
type="string"
length="1"
@@ -142,15 +134,15 @@
name="start_location_text"
top="576"
width="95">
- Start Location:
+ Start location:
</text>
<combo_box
allow_text_entry="true"
control_name="LoginLocation"
follows="left|bottom"
- height="18"
+ height="23"
layout="topleft"
- left_pad="2"
+ left_pad="0"
max_chars="128"
name="start_location_combo"
top_delta="-2"
@@ -172,13 +164,12 @@
control_name="RememberPassword"
follows="left|bottom"
height="16"
- label="Remember password"
+ label="Remember me"
layout="topleft"
left_pad="10"
name="remember_check"
top_delta="3"
width="138" />
-
<text
type="string"
length="1"
@@ -192,7 +183,7 @@
name="create_new_account_text"
top="539"
width="200">
- Sign up for account
+ Create a new account
</text>
<text
type="string"
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
index eabacbecb25f31573b9b2385ef6678087fcd8ed4..df5ea24c7352781a58e06eeece5407baf299c1d7 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<accordion_tab
- header_collapse_img="accordion_collapsed.tga"
- header_collapse_img_pressed="accordion_collapsed.tga"
- header_expand_img="accordion_expanded.tga"
- header_expand_img_pressed="accordion_expanded.tga" />
+<accordion_tab
+ header_collapse_img="Accordion_ArrowClosed_Off"
+ header_collapse_img_pressed="Accordion_ArrowClosed_Press"
+ header_expand_img="Accordion_ArrowOpened_Off"
+ header_expand_img_pressed="Accordion_ArrowOpened_Press" />
diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
index ada258fbece38b98fd98adedc77c55c92834c014..ec8395a7c5408ee6140756a557632a3aa48f0c5b 100644
--- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml
@@ -2,16 +2,16 @@
<filter_editor
clear_button_visible="true"
search_button_visible="true"
- text_pad_left="4"
+ text_pad_left="5"
select_on_focus="true"
background_image="TextField_Search_Off"
background_image_disabled="TextField_Search_Disabled"
- background_image_focused="TextField_Search_Active" >
+ background_image_focused="TextField_Search_Active">
<search_button label=""
top_pad="4"
- left_pad="4"
+ left_pad="4"
width="13"
- height="13"
+ height="13"
image_unselected="Search"
image_selected="Search" />
<clear_button label=""
diff --git a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
index e3a53eee4dce9e3e61f81c70dc70aa18ec9da822..a037d4904b4a53c422466056d2171d0b6f821208 100644
--- a/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/scroll_list.xml
@@ -10,7 +10,7 @@
highlighted_color="ScrollHighlightedColor"
column_padding="5"
draw_stripes="true"
- background_visible="true"
- heading_height="20"
- draw_border="true"
- draw_heading="false"/>
+ background_visible="false"
+ heading_height="23"
+ draw_border="false"
+ draw_heading="false" />