From 65b8b0899dea510ba14378811972e0712b3869c3 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Thu, 22 Jan 2015 12:59:00 +0200 Subject: MAINT-4800 FIXED Grid labels in combobox could be localized now. Combobox is wider and separator (empty line) was removed. --- indra/newview/skins/default/xui/en/panel_login.xml | 8 ++++---- indra/newview/skins/default/xui/en/strings.xml | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index a258a874b0..a1e0f981dd 100755 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -119,7 +119,7 @@ name="At_My_Last_Location_Label" left_pad="8" bottom_delta="1" - width="120"> + width="110"> at last location + width="148" /> Login failed. Quit http://join.secondlife.com/?sourceid=[sourceid] - + + Second Life Main Grid (Agni) + Second Life Beta Test Grid (Aditi) + http://secondlife.com/download The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer: -- cgit v1.2.3 From 8e081ec5a2f33c0eaf3aeee7b925cbfa43996213 Mon Sep 17 00:00:00 2001 From: maksymsproductengine Date: Thu, 22 Jan 2015 20:57:15 +0200 Subject: MAINT-4794 FIXED Present informative dialog if mesh upload fails due to specific reason --- indra/newview/skins/default/xui/en/notifications.xml | 5 ++--- indra/newview/skins/default/xui/en/strings.xml | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 5 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 1f816dc806..4602a41d52 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7772,9 +7772,8 @@ Select residents to share with. name="MeshUploadError" icon="alert.tga" type="alert"> - [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] - -See the log file for details. + [LABEL] failed to upload: [MESSAGE] [IDENTIFIER] +[DETAILS]See SecondLife.log for details Loading... - - + + + The physics shape contains triangles which are too small. Try simplifying the physics model. + + + + The physics shape contains bad confirmation data. Try to correct the physics model. + + + + The physics shape does not have correct version. Set the correct version for the physics model. + + + -- cgit v1.2.3 From 8f7064a8711d55188bdbb032ba9ee84dbd189f76 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Tue, 27 Jan 2015 11:36:54 +0200 Subject: MAINT-4825 FIXED Cancel button is added. Closing floater will discard changes made to the menu now. --- .../skins/default/xui/en/floater_hardware_settings.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml index 9deb0d2030..dcd6d98581 100755 --- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml @@ -191,8 +191,18 @@ label="OK" label_selected="OK" layout="topleft" - left="-102" + right="-105" name="OK" top="192" width="90" /> + - \ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml deleted file mode 100755 index 975b08be05..0000000000 --- a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - Postcard from [SECOND_LIFE]. - - - Check this out! - - - Sending... - - - - E-mail - - - - - - - - - \ No newline at end of file -- cgit v1.2.3 From 22ea223ddd2f2f9ed05a447dda2c4169a77d191e Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Thu, 26 Feb 2015 12:12:08 +0200 Subject: MAINT-4904 FIXED Show confirmation pop-up before unlinking an object. --- indra/newview/skins/default/xui/en/notifications.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 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 4602a41d52..df4bf6700b 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5365,7 +5365,21 @@ You cannot undo this action. notext="Cancel" yestext="OK"/> - + + + + This is a large linkset. If you unlink it, you may not be able to link it again. You may wish to take a copy of the linkset into your inventory as a precaution. + confirm + + + Date: Wed, 4 Mar 2015 15:55:23 +0200 Subject: MAINT-4939 FIXED Remove Abuse Report Pop-Up Dialog --- indra/newview/skins/default/xui/en/notifications.xml | 11 ----------- 1 file changed, 11 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 df4bf6700b..30ff90d1fd 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5379,17 +5379,6 @@ You cannot undo this action. notext="Cancel" yestext="Unlink"/> - - - - -Use this tool to report violations of the [http://secondlife.com/corporate/tos.php Terms of Service] and [http://secondlife.com/corporate/cs.php Community Standards]. - -All reported abuses are investigated and resolved. - Date: Wed, 11 Mar 2015 11:39:32 +0200 Subject: MAINT-4985 FIXED Update Return All Confirmation Message to Reflect Impact --- 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 30ff90d1fd..39e09cae79 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -783,7 +783,7 @@ Objects: [N] icon="alertmodal.tga" name="ReturnAllTopObjects" type="alertmodal"> -Are you sure you want to return all listed objects back to their owner's inventory? +Are you sure you want to return all listed objects back to their owner's inventory? This will return ALL scripted objects in the region! confirm Date: Mon, 30 Mar 2015 20:01:02 +0300 Subject: MAINT-5037 FIXED Viewer is operable under the leaving call confirmation dialog --- 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 39e09cae79..05b903b4bf 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8017,7 +8017,7 @@ We cannot display a preview of this texture because it is no-copy and/or no-tran + type="alertmodal"> Are you sure you want to leave this call? confirm voice -- cgit v1.2.3 From 12d19eec352e82314ac1ff3dfbfd5c9b9aa74a31 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Fri, 3 Apr 2015 12:48:20 +0300 Subject: MAINT-5041 FIXED Current Window snapshot option is restored. Hide height/width spinners when selecting this option. --- indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml index ea579c6dae..d019a0a310 100755 --- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml @@ -59,6 +59,10 @@ label="Large (512x512)" name="Large(512x512)" value="[i512,i512]" /> + Date: Thu, 7 May 2015 16:22:44 +0300 Subject: MAINT-4812 Restore sending snapshot as email from the viewer. --- .../skins/default/xui/en/floater_snapshot.xml | 6 ++ .../default/xui/en/panel_snapshot_options.xml | 17 ++++ .../default/xui/en/panel_snapshot_postcard.xml | 103 +++++++++++++++++++++ 3 files changed, 126 insertions(+) create mode 100644 indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 514fb058b9..76adaad57c 100755 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -266,6 +266,12 @@ layout="topleft" name="panel_snapshot_profile" filename="panel_snapshot_profile.xml" /> + + \ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml new file mode 100644 index 0000000000..975b08be05 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_snapshot_postcard.xml @@ -0,0 +1,103 @@ + + + + Postcard from [SECOND_LIFE]. + + + Check this out! + + + Sending... + + + + E-mail + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From 1845816aa2419353ace258b7cfe24bdd08357ebe Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Thu, 25 Jun 2015 16:36:38 +0300 Subject: MAINT-5299 FIXED [MAINT-RC] Unlinking individual prims from a linkset no longer works --- 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 ba8502ba81..93469aa3f4 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5382,7 +5382,7 @@ You cannot undo this action. name="ConfirmUnlink" type="alertmodal"> - This is a large linkset. If you unlink it, you may not be able to link it again. You may wish to take a copy of the linkset into your inventory as a precaution. + This is a large selection with linksets. If you unlink it, you may not be able to link it again. You may wish to take copies of linksets into your inventory as a precaution. confirm