From 5c16ae13758bdfe8fe1f13d5f67eabbb6eaa30a1 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 27 Aug 2024 12:02:41 +0300
Subject: viewer#2413 Remove obsolete alert about expiring voice morphs

---
 indra/newview/skins/default/xui/en/notifications.xml | 15 ---------------
 1 file changed, 15 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 e539388735..4a9dd62666 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8858,21 +8858,6 @@ If you are a Premium Member, [[PREMIUM_URL] click here] to receive your voice mo
     <tag>voice</tag>
   </notification>
 
-  <notification
-   icon="notify.tga"
-   name="VoiceEffectsWillExpire"
-   sound="UISndAlert"
-   persist="true"
-   type="notify">
-    <unique/>    
-One or more of your Voice Morphs will expire in less than [INTERVAL] days.
-[[URL] Click here] to renew your subscription.
-
-If you are a Premium Member, [[PREMIUM_URL] click here] to receive your voice morphing perk.
-  <tag>fail</tag>
-    <tag>voice</tag>
-  </notification>
-
   <notification
    icon="notify.tga"
    name="VoiceEffectsNew"
-- 
cgit v1.2.3


From cd8b0a4fc9062e2ea03c41c7c83dbbfde0755d8c Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 24 Sep 2024 20:15:50 +0300
Subject: Revert "viewer#2413 Remove obsolete alert about expiring voice
 morphs"

This reverts commit 5c16ae13758bdfe8fe1f13d5f67eabbb6eaa30a1.
Fix is correct, but should wait untill server sided fix gets deployed.
---
 indra/newview/skins/default/xui/en/notifications.xml | 15 +++++++++++++++
 1 file changed, 15 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 848d9aca7c..5ce73b2cfa 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8858,6 +8858,21 @@ If you are a Premium Member, [[PREMIUM_URL] click here] to receive your voice mo
     <tag>voice</tag>
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="VoiceEffectsWillExpire"
+   sound="UISndAlert"
+   persist="true"
+   type="notify">
+    <unique/>    
+One or more of your Voice Morphs will expire in less than [INTERVAL] days.
+[[URL] Click here] to renew your subscription.
+
+If you are a Premium Member, [[PREMIUM_URL] click here] to receive your voice morphing perk.
+  <tag>fail</tag>
+    <tag>voice</tag>
+  </notification>
+
   <notification
    icon="notify.tga"
    name="VoiceEffectsNew"
-- 
cgit v1.2.3


From d73395a0aa8ab4d2bb4623487be106690714524e Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 24 Sep 2024 20:23:06 +0300
Subject: viewer#2413 Add 'ignore' checkbox to expiring voice morphs

---
 indra/newview/skins/default/xui/en/notifications.xml | 6 +++++-
 1 file changed, 5 insertions(+), 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 5ce73b2cfa..a03259bd1b 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -8870,7 +8870,11 @@ One or more of your Voice Morphs will expire in less than [INTERVAL] days.
 
 If you are a Premium Member, [[PREMIUM_URL] click here] to receive your voice morphing perk.
   <tag>fail</tag>
-    <tag>voice</tag>
+  <tag>voice</tag>
+  <usetemplate
+      ignoretext="Warn me about voice morph expiring"
+      name="okignore"
+      yestext="OK"/>
   </notification>
 
   <notification
-- 
cgit v1.2.3