From f5e1ba26b7d9890e0735a22c875e0040bb504f3c Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Wed, 14 Dec 2016 17:24:26 +0200 Subject: MAINT-6899 Viewer should use fixed buttons instead of a scroll list for tabs in Appearance floater --- indra/newview/skins/default/xui/en/panel_outfits_inventory.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index ff0714adbb..df96ab80d8 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -30,6 +30,7 @@ tab_height="30" tab_position="top" halign="center" + hide_scroll_arrows="true" top="8" width="315"> Date: Fri, 16 Dec 2016 12:42:27 +0200 Subject: MAINT-6899 Reduce width of floater tabs --- indra/newview/skins/default/xui/en/panel_outfits_inventory.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index df96ab80d8..eeb930485e 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -26,7 +26,7 @@ layout="topleft" left="5" name="appearance_tabs" - tab_min_width="150" + tab_min_width="100" tab_height="30" tab_position="top" halign="center" -- cgit v1.2.3 From 18c463981215f60382293aa792b38ceb79cc7b76 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Wed, 21 Dec 2016 13:09:07 +0200 Subject: MAINT-7021 Add minimum width for statistics floaters --- indra/newview/skins/default/xui/en/floater_scene_load_stats.xml | 1 + indra/newview/skins/default/xui/en/floater_stats.xml | 1 + 2 files changed, 2 insertions(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml index b53698a9f2..62cce3a1e3 100644 --- a/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_scene_load_stats.xml @@ -7,6 +7,7 @@ save_rect="true" save_visibility="true" title="SCENE LOAD STATISTICS" + min_width="250" width="400"> Date: Tue, 27 Dec 2016 16:57:48 +0200 Subject: MAINT-1970 Inaccurate menu label in menu_gesture_gear --- indra/newview/skins/default/xui/en/menu_gesture_gear.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml index b08d21e8f4..c1458977ca 100644 --- a/indra/newview/skins/default/xui/en/menu_gesture_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_gesture_gear.xml @@ -5,8 +5,7 @@ name="menu_gesture_gear" visible="false"> Date: Wed, 28 Dec 2016 15:50:19 +0200 Subject: MAINT-406 Ban and access limits no longer showing --- indra/newview/skins/default/xui/en/floater_about_land.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index 8391bacf51..a137770e26 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -2014,7 +2014,7 @@ Only large parcels can be listed in search. name="AllowedText" top="0" width="230"> - Allowed Residents ([COUNT]) + Allowed Residents ([COUNT], max [MAX]) - Banned Residents ([COUNT]) + Banned Residents ([COUNT], max [MAX]) Date: Tue, 3 Jan 2017 16:22:58 +0200 Subject: MAINT-900 fixed male gestures spelling mistake --- indra/newview/skins/default/xui/en/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 88ad8bbf7b..b75f631799 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3815,7 +3815,7 @@ Abuse Report Male - Laugh Male - Repulsed Male - Shrug - Male - Stick tougue out + Male - Stick tongue out Male - Wow Female - Chuckle @@ -3834,7 +3834,7 @@ Abuse Report Female - Please Female - Repulsed Female - Shrug - Female - Stick tougue out + Female - Stick tongue out Female - Wow /bow -- cgit v1.2.3 From 9edc5b10697e5a4c5af90362d8158f427735740a Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Wed, 4 Jan 2017 13:34:44 +0200 Subject: MAINT-2193 FIXED Right half of Delete button in Pathfinding linksets window cannot be clicked --- indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml index 52d03cc432..00d70556b4 100644 --- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml @@ -290,7 +290,7 @@ layout="topleft" left="0" height="67" - width="1010"> + width="1070"> Date: Thu, 5 Jan 2017 11:41:11 +0200 Subject: MAINT-7034 Added second life events into menu --- indra/newview/skins/default/xui/en/menu_viewer.xml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index f911c2da7b..7c128d1523 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -447,6 +447,13 @@ function="Floater.Toggle" parameter="mini_map" /> + + + Date: Fri, 6 Jan 2017 10:08:19 +0200 Subject: MAINT-7039 Fixed typo --- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 512deed054..58869ec602 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4031,7 +4031,7 @@ An update was downloaded. It will be installed during restart. icon="alertmodal.tga" name="UpdateCheckError" type="alertmodal"> -An error occured while checking for update. +An error occurred while checking for update. Please try again later. confirm Date: Tue, 10 Jan 2017 15:09:02 +0200 Subject: MAINT-1384 FIXED Grid selection menu at login not working Ctrl-Shift-g --- indra/newview/skins/default/xui/en/menu_login.xml | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index a39ee5fddd..8cd0c415f4 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -20,6 +20,18 @@ function="Floater.Toggle" parameter="preferences" /> + + + + - - - - Date: Wed, 11 Jan 2017 13:07:01 +0200 Subject: MAINT-2001 Fixed the width of columns cannot be changed in Inspect Object --- indra/newview/skins/default/xui/en/floater_inspect.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml index bea35e5fc1..ae46736ddf 100644 --- a/indra/newview/skins/default/xui/en/floater_inspect.xml +++ b/indra/newview/skins/default/xui/en/floater_inspect.xml @@ -27,15 +27,15 @@ tool_tip="Select an object from this list to highlight it in-world" top="20"> Date: Thu, 19 Jan 2017 20:15:59 +0200 Subject: MAINT-2159 Fixed Health Meter Not Aligned --- indra/newview/skins/default/xui/en/widgets/location_input.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index 61ec046649..674be59753 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -133,7 +133,7 @@ name="damage_text" width="35" height="18" - top="17" + top="18" follows="right|top" halign="right" font="SansSerifSmall" -- cgit v1.2.3 From b94aa751c93b2c9bf9a9567946fe388a7c475d77 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 17 Jan 2017 20:11:00 +0200 Subject: MAINT-6959 Ability to set custom folders for uploading items --- .../skins/default/xui/en/floater_preferences.xml | 7 + .../skins/default/xui/en/menu_inventory.xml | 37 ++++++ .../default/xui/en/panel_preferences_uploads.xml | 142 +++++++++++++++++++++ 3 files changed, 186 insertions(+) create mode 100644 indra/newview/skins/default/xui/en/panel_preferences_uploads.xml (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index 9a9101e0da..5ca527ad20 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -120,6 +120,13 @@ layout="topleft" help_topic="preferences_advanced1_tab" name="advanced1" /> + diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 5b8a9413bf..e1f9269c70 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -321,6 +321,43 @@ parameter="eyes" /> + + + + + + + + + + + + + + + + + Current destination folders for uploads + + + + Images + + + + + Sounds + + + + + Animations + + + + + Models + + + + + To change a destination folder, right click on it in inventory and choose + "Use as default for" + + -- cgit v1.2.3 From e51fd03945ac0b2094b809c212eaa85b69ed0420 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 26 Jan 2017 09:43:10 +0200 Subject: MAINT-6959 swapping line edits with text boxes in preferences tab --- .../default/xui/en/panel_preferences_uploads.xml | 59 ++++++++++------------ 1 file changed, 26 insertions(+), 33 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml index f397d05408..487da54fdf 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_uploads.xml @@ -30,21 +30,19 @@ layout="topleft" left="37" name="title_models" - top_pad="20" + top_pad="17" width="100"> Images - @@ -56,21 +54,19 @@ layout="topleft" left="37" name="title_sounds" - top_pad="10" + top_pad="7" width="100"> Sounds - @@ -82,21 +78,19 @@ layout="topleft" left="37" name="title_animation" - top_pad="10" + top_pad="7" width="100"> Animations - @@ -108,21 +102,19 @@ layout="topleft" left="37" name="title_animation" - top_pad="10" + top_pad="7" width="100"> Models - @@ -132,9 +124,10 @@ follows="left|top" height="30" layout="topleft" + font.style="ITALIC" left="33" name="upload_help" - top_pad="10" + top_pad="6" width="387"> To change a destination folder, right click on it in inventory and choose "Use as default for" -- cgit v1.2.3 From ac784d669b5dbd617850854d89b31e0d82738413 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 31 Jan 2017 11:31:15 +0200 Subject: MAINT-7084 Add tally and limit values to Block list. --- .../skins/default/xui/en/panel_block_list_sidetray.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml index 53d0252215..4291a6859d 100644 --- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml @@ -90,6 +90,19 @@ top_delta="0" width="31"/> + + [COUNT] entries in your block list, and the limit is [LIMIT]. + -- cgit v1.2.3 From e10cc6d69dae10be846e20bbda74fc9cf9561729 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 31 Jan 2017 19:10:40 +0200 Subject: MAINT-7094 Fixed Adjust messages in the viewer for new xml tags --- .../newview/skins/default/xui/en/notifications.xml | 38 +++++++++++----------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 58869ec602..c4190a4940 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -9849,29 +9849,29 @@ Eject failed because you don't have admin permission for that parcel. fail -Can't move object '[OBJECT_NAME]' to -[OBJ_POSITION] in region [REGION_NAME] because the parcel is full. +Can't move object '[O]' to +[P] in region [R] because the parcel is full. fail -Can't move object '[OBJECT_NAME]' to -[OBJ_POSITION] in region [REGION_NAME] because your objects are not allowed on this parcel. +Can't move object '[O]' to +[P] in region [R] because your objects are not allowed on this parcel. fail -Can't move object '[OBJECT_NAME]' to -[OBJ_POSITION] in region [REGION_NAME] because there are not enough resources for this object on this parcel. +Can't move object '[O]' to +[P] in region [R] because there are not enough resources for this object on this parcel. - fail -Can't move object '[OBJECT_NAME]' to -[OBJ_POSITION] in region [REGION_NAME] because the other region is running an older version which does not support receiving this object via region crossing. + fail + Can't move object '[O]' to + [P] in region [R] because the other region is running an older version which does not support receiving this object via region crossing. fail -Can't move object '[OBJECT_NAME]' to -[OBJ_POSITION] in region [REGION_NAME] because you cannot modify the navmesh across region boundaries. +Can't move object '[O]' to +[P] in region [R] because you cannot modify the navmesh across region boundaries. fail -Can't move object '[OBJECT_NAME]' to -[OBJ_POSITION] in region [REGION_NAME] because of an unknown reason. ([FAILURE_TYPE]) +Can't move object '[O]' to +[P] in region [R] because of an unknown reason. ([F]) Date: Wed, 1 Feb 2017 10:57:12 +0200 Subject: MAINT-725 Script debug floater functionality is borked, rendering it completely useless for scripters --- indra/newview/skins/default/xui/en/floater_script_debug.xml | 1 + indra/newview/skins/default/xui/en/menu_viewer.xml | 10 ++++++++++ 2 files changed, 11 insertions(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_script_debug.xml b/indra/newview/skins/default/xui/en/floater_script_debug.xml index 53d4925214..cd88048d6b 100644 --- a/indra/newview/skins/default/xui/en/floater_script_debug.xml +++ b/indra/newview/skins/default/xui/en/floater_script_debug.xml @@ -7,6 +7,7 @@ help_topic="script_debug_floater" save_rect="true" title="Script Warning/Error" + reuse_instance="true" width="450"> + + + + -- cgit v1.2.3 From eacf7252d01e8f0d0becfdb403846e08480cf754 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Wed, 1 Feb 2017 12:04:16 +0200 Subject: MAINT-7096 FIXED The last item on the block list cannot be read --- indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml index 4291a6859d..574e5f3cbc 100644 --- a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml +++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml @@ -105,7 +105,7 @@ Date: Mon, 6 Feb 2017 17:29:45 +0200 Subject: MAINT-2001 Fixes colums misbeheaving --- indra/newview/skins/default/xui/en/floater_inspect.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml index ae46736ddf..63334e2b24 100644 --- a/indra/newview/skins/default/xui/en/floater_inspect.xml +++ b/indra/newview/skins/default/xui/en/floater_inspect.xml @@ -27,21 +27,21 @@ tool_tip="Select an object from this list to highlight it in-world" top="20"> + name="creation_date" /> -- cgit v1.2.3