From 55490574c873881306cfc69dee2f0453f92da52f Mon Sep 17 00:00:00 2001 From: Northspring Date: Sat, 15 Nov 2014 20:18:45 +0100 Subject: Additional changes for commit 999f81951c14 - necessary changes for files in /en/ directory in order to make files properly localizable Also, removing some found duplicates in notifications.xml --- .../newview/skins/default/xui/en/notifications.xml | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f1d34a1449..05bda0259d 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3792,30 +3792,8 @@ Leave Group? yestext="OK"/> - -Unable to leave group: [reason]. - reason - - - -You have left the group [group_name]. - group_name - - - - Unable to leave group: [reason]. -- cgit v1.2.3 From 38703d62e382bf7e57a0d3c2ab55714e99889e32 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Thu, 20 Nov 2014 08:37:55 -0500 Subject: STORM-2085 Spelling error and duplicate entry in notifications.xml --- indra/newview/skins/default/xui/en/notifications.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f1d34a1449..83384e0902 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3792,17 +3792,6 @@ Leave Group? yestext="OK"/> - -Unable to leave group: [reason]. - reason - - - Unable to leave group: [reason]. -- cgit v1.2.3 From 2e0d7ce282c007d791301ac73ff58c39dd40af81 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 21 Nov 2014 06:46:43 -0500 Subject: STORM-2085 Remove additional duplicate entry GroupDepart --- indra/newview/skins/default/xui/en/notifications.xml | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 83384e0902..05bda0259d 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3792,17 +3792,6 @@ Leave Group? yestext="OK"/> - -You have left the group [group_name]. - group_name - - - Date: Mon, 1 Dec 2014 08:09:17 -0500 Subject: STORM-2082 Implement save floater and some code cleanup. --- indra/newview/skins/default/xui/en/notifications.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f1d34a1449..e1d2f012d3 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7657,6 +7657,20 @@ Are you sure you want to close all IMs? Attachment has been saved. + +Preset [NAME] has been saved. + + + +Preset [NAME] has been deleted. + + Date: Mon, 1 Dec 2014 13:54:32 -0500 Subject: STORM-2082 Disable preset controls unless logged in --- indra/newview/skins/default/xui/en/notifications.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index e1d2f012d3..1618ea0ec7 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7658,16 +7658,16 @@ Attachment has been saved. + type="notifytip"> Preset [NAME] has been saved. + type="notifytip"> Preset [NAME] has been deleted. -- cgit v1.2.3 From 77b9793c2eb357184aedee85000c90c4b1c3e574 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Mon, 1 Dec 2014 20:36:09 -0500 Subject: STORM-2082 Improve text in notifications. Disable delete button when thre is nothing to be deleted. --- indra/newview/skins/default/xui/en/notifications.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 1618ea0ec7..83370dbba0 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7661,14 +7661,14 @@ Attachment has been saved. icon="notifytip.tga" name="PresetSaved" type="notifytip"> -Preset [NAME] has been saved. +[TYPE] preset [NAME] has been saved. -Preset [NAME] has been deleted. +[TYPE] preset [NAME] has been deleted. Date: Tue, 2 Dec 2014 07:42:32 -0500 Subject: STORM-2082 Add Recommended button --- indra/newview/skins/default/xui/en/notifications.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 83370dbba0..1618ea0ec7 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7661,14 +7661,14 @@ Attachment has been saved. icon="notifytip.tga" name="PresetSaved" type="notifytip"> -[TYPE] preset [NAME] has been saved. +Preset [NAME] has been saved. -[TYPE] preset [NAME] has been deleted. +Preset [NAME] has been deleted. Date: Fri, 12 Dec 2014 11:13:11 -0500 Subject: STORM-2082 Merge Hardware floater into main graphics preferences display Change notifications so they are emitted only when an error occurs Put active preset at top of list Add Maximum ARC slider Merge two small methods into slider update code --- indra/newview/skins/default/xui/en/notifications.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 1618ea0ec7..340777faf3 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7659,16 +7659,16 @@ Attachment has been saved. -Preset [NAME] has been saved. +Error saving preset [NAME]. -Preset [NAME] has been deleted. +Error deleting preset [NAME]. Date: Wed, 31 Dec 2014 07:20:52 -0500 Subject: STORM-2099 Minor formatting issue with logged out message --- indra/newview/skins/default/xui/en/notifications.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index ea1bc66236..157cd94939 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2463,8 +2463,9 @@ This is usually a temporary failure. Please customize and save the wearable agai icon="alertmodal.tga" name="YouHaveBeenLoggedOut" type="alertmodal"> -Darn. You have been logged out of [SECOND_LIFE] - [MESSAGE] +Darn. You have been logged out of [SECOND_LIFE]. + +[MESSAGE] Date: Wed, 19 Aug 2015 15:43:06 -0400 Subject: MAINT-5378 Add notices for avatar complexity changes --- .../newview/skins/default/xui/en/notifications.xml | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index d0ccf2e2d8..97c4c924e7 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3293,6 +3293,30 @@ You can use [SECOND_LIFE] normally and other people will see you correctly. + + + AgentComplexityNotice + + Your visual complexity is [AGENT_COMPLEXITY]. +[OVERLIMIT_PCT]% of nearby users may not fully show you +with complexity this high. + + + + + AgentComplexityNotice + +Your visual complexity is [AGENT_COMPLEXITY]. + + Date: Wed, 26 Aug 2015 16:57:28 -0400 Subject: refine messages per MAINT-5376 (no percentage) --- indra/newview/skins/default/xui/en/notifications.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 97c4c924e7..e603e0aebe 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3302,8 +3302,7 @@ You can use [SECOND_LIFE] normally and other people will see you correctly. AgentComplexityNotice Your visual complexity is [AGENT_COMPLEXITY]. -[OVERLIMIT_PCT]% of nearby users may not fully show you -with complexity this high. +[OVERLIMIT_MSG] Date: Wed, 2 Sep 2015 14:09:53 -0400 Subject: MAINT-5570: add explanation links to complexity messages (using temporary wiki links) --- indra/newview/skins/default/xui/en/notifications.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index e603e0aebe..394ea5f0b1 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3301,7 +3301,7 @@ You can use [SECOND_LIFE] normally and other people will see you correctly. AgentComplexityNotice - Your visual complexity is [AGENT_COMPLEXITY]. +Your [https://wiki.secondlife.com/wiki/Avatar_Rendering_Complexity visual complexity] is [AGENT_COMPLEXITY]. [OVERLIMIT_MSG] @@ -3313,7 +3313,7 @@ You can use [SECOND_LIFE] normally and other people will see you correctly. AgentComplexityNotice -Your visual complexity is [AGENT_COMPLEXITY]. +Your [https://wiki.secondlife.com/wiki/Avatar_Rendering_Complexity visual complexity] is [AGENT_COMPLEXITY]. Date: Thu, 24 Sep 2015 11:23:25 -0400 Subject: SL-217: change documentation link from the wiki to the knowledge base article --- indra/newview/skins/default/xui/en/notifications.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 394ea5f0b1..22ed52ae33 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3301,7 +3301,7 @@ You can use [SECOND_LIFE] normally and other people will see you correctly. AgentComplexityNotice -Your [https://wiki.secondlife.com/wiki/Avatar_Rendering_Complexity visual complexity] is [AGENT_COMPLEXITY]. +Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 visual complexity] is [AGENT_COMPLEXITY]. [OVERLIMIT_MSG] @@ -3313,7 +3313,7 @@ Your [https://wiki.secondlife.com/wiki/Avatar_Rendering_Complexity visual comple AgentComplexityNotice -Your [https://wiki.secondlife.com/wiki/Avatar_Rendering_Complexity visual complexity] is [AGENT_COMPLEXITY]. +Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 visual complexity] is [AGENT_COMPLEXITY]. Date: Tue, 10 Nov 2015 09:48:56 -0500 Subject: remove execute permission from many files that should not have it --- indra/newview/skins/default/xui/en/notifications.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 indra/newview/skins/default/xui/en/notifications.xml (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml old mode 100755 new mode 100644 -- cgit v1.2.3 From 77ef10e0493a192a1e7f1cb988bac757bd199f69 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 7 Apr 2016 10:04:05 +0200 Subject: OPEN-292: More removal of orphaned legacy script upload methods --- .../newview/skins/default/xui/en/notifications.xml | 32 ---------------------- 1 file changed, 32 deletions(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index cf6eac66b7..10cce8432b 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -552,22 +552,6 @@ This listing could not be updated. yestext="OK"/> - -There was a problem uploading the text for a script due to the following reason: [REASON]. Please try again later. - fail - - - -There was a problem uploading the compiled script due to the following reason: [REASON]. Please try again later. - fail - - - -There was a problem saving a script due to the following reason: [REASON]. Please try re-saving the script later. -fail - - fail - -There was a problem saving a compiled script due to the following reason: [REASON]. Please try re-saving the script later. -fail - - Date: Thu, 28 Apr 2016 10:53:15 -0400 Subject: clean up terminology for jelly dolls / avatar complexity --- indra/newview/skins/default/xui/en/notifications.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 10cce8432b..3c84f5edc6 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3317,7 +3317,7 @@ You can use [SECOND_LIFE] normally and other people will see you correctly. AgentComplexityNotice -Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 visual complexity] is [AGENT_COMPLEXITY]. +Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] is [AGENT_COMPLEXITY]. [OVERLIMIT_MSG] @@ -3329,7 +3329,7 @@ Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Renderin AgentComplexityNotice -Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 visual complexity] is [AGENT_COMPLEXITY]. +Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] is [AGENT_COMPLEXITY]. Date: Thu, 28 Apr 2016 14:42:13 -0400 Subject: minor code clarity improvements --- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 3c84f5edc6..47116dc8e3 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3311,7 +3311,7 @@ You can use [SECOND_LIFE] normally and other people will see you correctly. -- cgit v1.2.3 From 9a83367e43205dcd76958f7773def9d7d0874ad7 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 29 Apr 2016 14:07:57 -0400 Subject: MAINT-6373: allow user to ignore notices about whether or not they are being rendered --- indra/newview/skins/default/xui/en/notifications.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 47116dc8e3..9810242f5d 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3319,6 +3319,9 @@ You can use [SECOND_LIFE] normally and other people will see you correctly. Your [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 avatar complexity] is [AGENT_COMPLEXITY]. [OVERLIMIT_MSG] +