From 52baeb34b38d20f4bde5ee931621377ef9e4cb31 Mon Sep 17 00:00:00 2001 From: angela Date: Tue, 19 Jan 2010 11:06:17 +0800 Subject: EXT-4269 PDD: Add teleport destination to teleport warning dialog --- indra/newview/skins/default/xui/en/notifications.xml | 2 +- indra/newview/skins/default/xui/en/panel_navigation_bar.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 957b4d74db..0768706223 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3058,7 +3058,7 @@ Join me in [REGION] icon="alertmodal.tga" name="TeleportFromLandmark" type="alertmodal"> -Are you sure you want to teleport? +Are you sure you want to teleport to [LOCATION]? + bottom="55" + width="590"> Date: Tue, 19 Jan 2010 13:38:51 +0800 Subject: EXT-3833 [BSI] Build Tools -> Objects -> Slice Begin & End text unreadable --- indra/newview/skins/default/xui/en/floater_tools.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index a1e190fc5e..f1aa5c27c1 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -1687,6 +1687,7 @@ even though the user gets a free copy. Taper Date: Wed, 20 Jan 2010 15:44:34 -0500 Subject: Finished layout of appearance editor. http://jira.secondlife.com/browse/EXT-146 --- .../skins/default/xui/en/floater_customize.xml | 1496 ++++++++++---------- .../skins/default/xui/en/widgets/color_swatch.xml | 2 +- 2 files changed, 730 insertions(+), 768 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml index ddc0d9af72..b048eeceb6 100644 --- a/indra/newview/skins/default/xui/en/floater_customize.xml +++ b/indra/newview/skins/default/xui/en/floater_customize.xml @@ -3,7 +3,7 @@ legacy_header_height="18" can_minimize="false" follows="left|top" - height="607" + height="583" layout="topleft" left_delta="-3" name="floater customize" @@ -20,7 +20,7 @@ tab_min_width="96" tab_position="left" tab_height="50" - top="50" + top="26" width="506"> You do not have permission to modify this wearable. @@ -473,9 +472,9 @@ follows="left|top|right" height="28" layout="topleft" - left_delta="0" + left="10" name="no modify instructions" - top_delta="0" + top="31" word_wrap="true" width="373"> You do not have permission to modify this wearable. @@ -723,9 +722,9 @@ follows="left|top|right" height="28" layout="topleft" - left_delta="0" + left="10" name="no modify instructions" - top_delta="0" + top="31" word_wrap="true" width="373"> You do not have permission to modify this wearable. @@ -798,16 +797,16 @@ width="82" /> + width="400"> [DESC] @@ -845,9 +844,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="0" + left="31" name="title_no_modify" - top_delta="0" + top="10" width="355"> [DESC]: cannot modify @@ -858,9 +857,9 @@ font="SansSerif" height="16" layout="topleft" - left_delta="0" + left="31" name="title_loading" - top_delta="0" + top="10" width="355"> [DESC]: loading... @@ -871,21 +870,21 @@ font="SansSerif" height="16" layout="topleft" - left_delta="0" + left="31" name="title_not_worn" - top_delta="0" + top="10" width="355"> [DESC]: not worn Located in [PATH] @@ -895,9 +894,9 @@ follows="left|top|right" height="28" layout="topleft" - left_delta="0" + left="10" name="not worn instructions" - top_pad="8" + top="31" word_wrap="true" width="373"> Put on a new set of eyes by dragging one from your inventory to your avatar. Alternately, you create a new one from scratch and wear it. @@ -908,9 +907,9 @@ follows="left|top|right" height="28" layout="topleft" - left_delta="0" + left="10" name="no modify instructions" - top_delta="0" + top="31" word_wrap="true" width="373"> You do not have permission to modify this wearable. @@ -918,14 +917,14 @@ Eyes: @@ -933,23 +932,22 @@ can_apply_immediately="true" default_image_name="Default" follows="left|top" - height="80" + height="108" label="Iris" layout="topleft" - left="8" + left="10" name="Iris" tool_tip="Click to choose a picture" - top="65" - width="64" /> + top="66" + width="82" /> - + + width="21" /> + + width="21" /> + + width="20" /> + width="21" /> - \ No newline at end of file + diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml index 86bea9be50..8918120918 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml @@ -3,14 +3,22 @@ height="25" name="offer_chiclet" width="25"> + + width="21" /> \ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml index b1f9f5b0e8..8e3541231d 100644 --- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml +++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml @@ -3,14 +3,22 @@ height="25" name="script_chiclet" width="25"> + + width="21"/> Date: Wed, 20 Jan 2010 15:36:05 -0800 Subject: EXT-4482 [BSI] People > Profile - when window is too short, scroll bar cuts off text --- indra/newview/skins/default/xui/en/panel_profile.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index 597b6410cd..4ac7295a7f 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -66,6 +66,7 @@ layout="topleft" follows="left|top|right" height="505" + min_height="505" name="profile_scroll_panel" top="0" left="0" @@ -108,10 +109,10 @@ textbox.max_length="512" name="sl_description_edit" top_pad="-3" - width="185" + width="180" expanded_bg_visible="true" expanded_bg_color="DkGray"> - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. @@ -286,7 +287,7 @@ height="28" layout="topleft" name="profile_buttons_panel" - auto_resize="false" + auto_resize="false" width="313"> - - Mouselook: - - - Mouse sensitivity - - - - - Network: - - - Maximum bandwidth - - - - kbps - - - - - - - Cache size - - - - MB - - - Cache location: - - - - - - Web: - - - - - - - - - Proxy location: - - - - + + + + + Mouselook: + + + Mouse sensitivity + + + + + Network: + + + Maximum bandwidth + + + + kbps + + + + + + + Cache size + + + + MB + + + Cache location: + + + + + + + Web: + + + + + + + + + Proxy location: + + + + \ No newline at end of file -- cgit v1.2.3 From 01af3b805a7cffbeb7ff51809e35399bc472bb2d Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 21 Jan 2010 15:14:11 -0800 Subject: eol --- indra/newview/skins/default/xui/en/panel_preferences_setup.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index a0bd2bd438..9875062186 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -343,4 +343,4 @@ name="web_proxy_port" top_delta="0" width="140" /> - \ No newline at end of file + -- cgit v1.2.3 From 24328b6cc77daec2c42528fcf7025634519320db Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 21 Jan 2010 15:15:39 -0800 Subject: Backed out changeset: 191ec27bc583 --- .../default/xui/en/panel_preferences_setup.xml | 688 ++++++++++----------- 1 file changed, 342 insertions(+), 346 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index a0bd2bd438..f6900cc31c 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -1,346 +1,342 @@ - - - - - Mouselook: - - - Mouse sensitivity - - - - - Network: - - - Maximum bandwidth - - - - kbps - - - - - - - Cache size - - - - MB - - - Cache location: - - - - - - - Web: - - - - - - - - - Proxy location: - - - - \ No newline at end of file + + + + + Mouselook: + + + Mouse sensitivity + + + + + Network: + + + Maximum bandwidth + + + + kbps + + + + + + + Cache size + + + + MB + + + Cache location: + + + + + + Web: + + + + + + + + + Proxy location: + + + + -- cgit v1.2.3 From 63441873cc4cca5c9d41dec3d313199a69c87b30 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 21 Jan 2010 15:58:35 -0800 Subject: updating --- indra/newview/skins/default/xui/en/panel_preferences_setup.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index 8d505f4ad9..ac1ea26b38 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -873,5 +873,5 @@ min_val="10" name="web_proxy_port" top_delta="0" - width="140" /> + width="140"/> -- cgit v1.2.3 From 5432b9bd9a5979d24d814990957cbd1351e7ba48 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 21 Jan 2010 16:00:51 -0800 Subject: fixing? --- .../default/xui/en/panel_preferences_setup.xml | 1754 ++++++++++---------- 1 file changed, 877 insertions(+), 877 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index ac1ea26b38..8d033c2ae6 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -1,877 +1,877 @@ - - - - - Mouselook: - - - Mouse sensitivity - - - - - Network: - - - Maximum bandwidth - - - - kbps - - - - - - - Cache size - - - - MB - - - Cache location: - - - - - - Web: - - - - - - - - - Proxy location: - - - - - - Network: - - - Maximum bandwidth - - - - kbps - - - - - - - Cache size - - - - MB - - - Cache location: - - - - - - - Web: - - - - - - - - - Proxy location: - - - - - Network: - - - Maximum bandwidth - - - - kbps - - - - - - - Cache size - - - - MB - - - Cache location: - - - - - - - Web: - - - - - - - - - Proxy location: - - - - + + + + + Mouselook: + + + Mouse sensitivity + + + + + Network: + + + Maximum bandwidth + + + + kbps + + + + + + + Cache size + + + + MB + + + Cache location: + + + + + + Web: + + + + + + + + + Proxy location: + + + + + + Network: + + + Maximum bandwidth + + + + kbps + + + + + + + Cache size + + + + MB + + + Cache location: + + + + + + + Web: + + + + + + + + + Proxy location: + + + + + Network: + + + Maximum bandwidth + + + + kbps + + + + + + + Cache size + + + + MB + + + Cache location: + + + + + + + Web: + + + + + + + + + Proxy location: + + + + -- cgit v1.2.3 From 9611af4f596c1f6ce1a0e3c91763b6e3ee343835 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 21 Jan 2010 16:09:38 -0800 Subject: fixed. --- .../default/xui/en/panel_preferences_setup.xml | 1223 ++++++-------------- 1 file changed, 346 insertions(+), 877 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index 8d033c2ae6..ec7e140eed 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -1,877 +1,346 @@ - - - - - Mouselook: - - - Mouse sensitivity - - - - - Network: - - - Maximum bandwidth - - - - kbps - - - - - - - Cache size - - - - MB - - - Cache location: - - - - - - Web: - - - - - - - - - Proxy location: - - - - - - Network: - - - Maximum bandwidth - - - - kbps - - - - - - - Cache size - - - - MB - - - Cache location: - - - - - - - Web: - - - - - - - - - Proxy location: - - - - - Network: - - - Maximum bandwidth - - - - kbps - - - - - - - Cache size - - - - MB - - - Cache location: - - - - - - - Web: - - - - - - - - - Proxy location: - - - - + + + + + Mouselook: + + + Mouse sensitivity + + + + + Network: + + + Maximum bandwidth + + + + kbps + + + + + + + Cache size + + + + MB + + + Cache location: + + + + + + + Web: + + + + + + + + + Proxy location: + + + + -- cgit v1.2.3 From 79f252526f37781417ae1ea5b8dce0bbc148b14b Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 21 Jan 2010 16:10:29 -0800 Subject: another fix. --- .../default/xui/en/panel_preferences_setup.xml | 692 ++++++++++----------- 1 file changed, 346 insertions(+), 346 deletions(-) (limited to 'indra/newview/skins/default/xui') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index ec7e140eed..17ababe854 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -1,346 +1,346 @@ - - - - - Mouselook: - - - Mouse sensitivity - - - - - Network: - - - Maximum bandwidth - - - - kbps - - - - - - - Cache size - - - - MB - - - Cache location: - - - - - - - Web: - - - - - - - - - Proxy location: - - - - + + + + + Mouselook: + + + Mouse sensitivity + + + + + Network: + + + Maximum bandwidth + + + + kbps + + + + + + + Cache size + + + + MB + + + Cache location: + + + + + + + Web: + + + + + + + + + Proxy location: + + + + -- cgit v1.2.3