Skip to content

Commit 5c16ae1

Browse files
akleshchevakleshchev
committed
viewer#2413 Remove obsolete alert about expiring voice morphs
1 parent 124f071 commit 5c16ae1

15 files changed

+0
-119
lines changed

‎indra/newview/app_settings/settings.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13158,17 +13158,6 @@
1315813158
<key>Value</key>
1315913159
<integer>0</integer>
1316013160
</map>
13161-
<key>VoiceEffectExpiryWarningTime</key>
13162-
<map>
13163-
<key>Comment</key>
13164-
<string>How much notice to give of Voice Morph subscriptions expiry, in seconds.</string>
13165-
<key>Persist</key>
13166-
<integer>1</integer>
13167-
<key>Type</key>
13168-
<string>S32</string>
13169-
<key>Value</key>
13170-
<integer>259200</integer>
13171-
</map>
1317213161
<key>VoiceMorphingEnabled</key>
1317313162
<map>
1317413163
<key>Comment</key>

‎indra/newview/llvoicevivox.cpp

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6459,7 +6459,6 @@ LLVivoxVoiceClient::voiceFontEntry::voiceFontEntry(LLUUID& id) :
64596459
mIsNew(false)
64606460
{
64616461
mExpiryTimer.stop();
6462-
mExpiryWarningTimer.stop();
64636462
}
64646463

64656464
LLVivoxVoiceClient::voiceFontEntry::~voiceFontEntry()
@@ -6570,20 +6569,6 @@ void LLVivoxVoiceClient::addVoiceFont(const S32 font_index,
65706569
font->mExpiryTimer.start();
65716570
font->mExpiryTimer.setExpiryAt(expiration_date.secondsSinceEpoch() - VOICE_FONT_EXPIRY_INTERVAL);
65726571

6573-
// Set the warning timer to some interval before actual expiry.
6574-
S32 warning_time = gSavedSettings.getS32("VoiceEffectExpiryWarningTime");
6575-
if (warning_time != 0)
6576-
{
6577-
font->mExpiryWarningTimer.start();
6578-
F64 expiry_time = (expiration_date.secondsSinceEpoch() - (F64)warning_time);
6579-
font->mExpiryWarningTimer.setExpiryAt(expiry_time - VOICE_FONT_EXPIRY_INTERVAL);
6580-
}
6581-
else
6582-
{
6583-
// Disable the warning timer.
6584-
font->mExpiryWarningTimer.stop();
6585-
}
6586-
65876572
// Only flag new session fonts after the first time we have fetched the list.
65886573
if (mVoiceFontsReceived)
65896574
{
@@ -6625,7 +6610,6 @@ void LLVivoxVoiceClient::expireVoiceFonts()
66256610
// than checking each font individually.
66266611

66276612
bool have_expired = false;
6628-
bool will_expire = false;
66296613
bool expired_in_use = false;
66306614

66316615
LLUUID current_effect = LLVoiceClient::instance().getVoiceEffectDefault();
@@ -6635,7 +6619,6 @@ void LLVivoxVoiceClient::expireVoiceFonts()
66356619
{
66366620
voiceFontEntry* voice_font = iter->second;
66376621
LLFrameTimer& expiry_timer = voice_font->mExpiryTimer;
6638-
LLFrameTimer& warning_timer = voice_font->mExpiryWarningTimer;
66396622

66406623
// Check for expired voice fonts
66416624
if (expiry_timer.getStarted() && expiry_timer.hasExpired())
@@ -6652,14 +6635,6 @@ void LLVivoxVoiceClient::expireVoiceFonts()
66526635
deleteVoiceFont(voice_font->mID);
66536636
have_expired = true;
66546637
}
6655-
6656-
// Check for voice fonts that will expire in less that the warning time
6657-
if (warning_timer.getStarted() && warning_timer.hasExpired())
6658-
{
6659-
LL_DEBUGS("VoiceFont") << "Voice Font " << voice_font->mName << " will expire soon." << LL_ENDL;
6660-
will_expire = true;
6661-
warning_timer.stop();
6662-
}
66636638
}
66646639

66656640
LLSD args;
@@ -6681,15 +6656,6 @@ void LLVivoxVoiceClient::expireVoiceFonts()
66816656
// Refresh voice font lists in the UI.
66826657
notifyVoiceFontObservers();
66836658
}
6684-
6685-
// Give a warning notification if any voice fonts are due to expire.
6686-
if (will_expire)
6687-
{
6688-
S32Seconds seconds(gSavedSettings.getS32("VoiceEffectExpiryWarningTime"));
6689-
args["INTERVAL"] = llformat("%d", LLUnit<S32, LLUnits::Days>(seconds).value());
6690-
6691-
LLNotificationsUtil::add("VoiceEffectsWillExpire", args);
6692-
}
66936659
}
66946660

66956661
void LLVivoxVoiceClient::deleteVoiceFont(const LLUUID& id)

‎indra/newview/llvoicevivox.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,6 @@ class LLVivoxVoiceClient : public LLSingleton<LLVivoxVoiceClient>,
880880
bool mIsNew;
881881

882882
LLFrameTimer mExpiryTimer;
883-
LLFrameTimer mExpiryWarningTimer;
884883
};
885884

886885
bool mVoiceFontsReceived;

‎indra/newview/skins/default/xui/da/notifications.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1572,10 +1572,6 @@ Klik på Acceptér for at deltage eller Afvis for at afvise invitationen. Klik p
15721572
</notification>
15731573
<notification name="VoiceEffectsExpiredInUse">
15741574
Den aktive stemme &quot;morph&quot; er udløbet og din normale stemme opsætning er genaktiveret.
1575-
[[URL] Click here] for at forny dit abbonnement.
1576-
</notification>
1577-
<notification name="VoiceEffectsWillExpire">
1578-
En eller flere af dine stemme &quot;morphs&quot; vil udløbe om mindre end [INTERVAL] dage.
15791575
[[URL] Click here] for at forny dit abbonnement.
15801576
</notification>
15811577
<notification name="VoiceEffectsNew">

‎indra/newview/skins/default/xui/de/notifications.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2465,10 +2465,6 @@ Wenn Sie Premium-Mitglied sind, [[PREMIUM_URL] klicken Sie hier], um Ihren Voice
24652465
<notification name="VoiceEffectsExpiredInUse">Das aktive Voice-Morph-Abo ist abgelaufen. Ihre normalen Voice-Einstellungen werden angewendet.
24662466
[[URL] Klicken Sie hier], um Ihr Abo zu erneuern.
24672467

2468-
Wenn Sie Premium-Mitglied sind, [[PREMIUM_URL] klicken Sie hier], um Ihren Voice-Morphing-Vorteil zu nutzen.</notification>
2469-
<notification name="VoiceEffectsWillExpire">Ein oder mehrere Ihrer Voice-Morph-Abos laufen in weniger als [INTERVAL] Tagen ab.
2470-
[[URL] Klicken Sie hier], um Ihr Abo zu erneuern.
2471-
24722468
Wenn Sie Premium-Mitglied sind, [[PREMIUM_URL] klicken Sie hier], um Ihren Voice-Morphing-Vorteil zu nutzen.</notification>
24732469
<notification name="VoiceEffectsNew">Neue Voice-Morph-Effekte sind erhältlich!</notification>
24742470
<notification name="Cannot enter parcel: not a group member">Nur Mitglieder einer bestimmten Gruppe dürfen diesen Bereich betreten.</notification>

‎indra/newview/skins/default/xui/en/notifications.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8858,21 +8858,6 @@ If you are a Premium Member, [[PREMIUM_URL] click here] to receive your voice mo
88588858
<tag>voice</tag>
88598859
</notification>
88608860

8861-
<notification
8862-
icon="notify.tga"
8863-
name="VoiceEffectsWillExpire"
8864-
sound="UISndAlert"
8865-
persist="true"
8866-
type="notify">
8867-
<unique/>
8868-
One or more of your Voice Morphs will expire in less than [INTERVAL] days.
8869-
[[URL] Click here] to renew your subscription.
8870-
8871-
If you are a Premium Member, [[PREMIUM_URL] click here] to receive your voice morphing perk.
8872-
<tag>fail</tag>
8873-
<tag>voice</tag>
8874-
</notification>
8875-
88768861
<notification
88778862
icon="notify.tga"
88788863
name="VoiceEffectsNew"

‎indra/newview/skins/default/xui/es/notifications.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2451,10 +2451,6 @@ Si eres un miembro Premium [[PREMIUM_URL] pulsa aquí] para recibir tu beneficio
24512451
<notification name="VoiceEffectsExpiredInUse">La transformación de voz activa ha caducado y se ha aplicado tu configuración de voz normal.
24522452
[[URL] Pulsa aquí] para renovar la suscripción.
24532453

2454-
Si eres un miembro Premium [[PREMIUM_URL] pulsa aquí] para recibir tu beneficio de transformación de voz.</notification>
2455-
<notification name="VoiceEffectsWillExpire">Una o más de tus transformaciones de voz caducarán en menos de [INTERVAL] días.
2456-
[[URL] Pulsa aquí] para renovar la suscripción
2457-
24582454
Si eres un miembro Premium [[PREMIUM_URL] pulsa aquí] para recibir tu beneficio de transformación de voz.</notification>
24592455
<notification name="VoiceEffectsNew">Están disponibles nuevas transformaciones de voz.</notification>
24602456
<notification name="Cannot enter parcel: not a group member">Sólo los miembros de un grupo determinado pueden visitar esta zona.</notification>

‎indra/newview/skins/default/xui/fr/notifications.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2451,10 +2451,6 @@ Si vous êtes un membre Premium, [[PREMIUM_URL] cliquez ici] pour recevoir votr
24512451
[[URL] Cliquez ici] pour renouveler votre abonnement.
24522452

24532453
Si vous êtes un membre Premium, [[PREMIUM_URL] cliquez ici] pour recevoir votre effet de voix.</notification>
2454-
<notification name="VoiceEffectsWillExpire">Au moins l'un de vos effets de voix expirera dans moins de [INTERVAL] jours.
2455-
[[URL] Cliquez ici] pour renouveler votre abonnement.
2456-
2457-
Si vous êtes un membre Premium, [[PREMIUM_URL] cliquez ici] pour recevoir votre effet de voix.</notification>
24582454
<notification name="VoiceEffectsNew">De nouveaux effets de voix sont disponibles !</notification>
24592455
<notification name="Cannot enter parcel: not a group member">Seuls les membres d'un certain groupe peuvent visiter cette zone.</notification>
24602456
<notification name="Cannot enter parcel: banned">Vous ne pouvez pas pénétrer sur ce terrain car l'accès vous y est interdit.</notification>

‎indra/newview/skins/default/xui/it/notifications.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2453,10 +2453,6 @@ Se sei un membro Premium, [[PREMIUM_URL] fai clic qui] per ricevere in regalo la
24532453
<notification name="VoiceEffectsExpiredInUse">Poiché la manipolazione vocale attiva è scaduta, sono state applicate le tue impostazioni normali.
24542454
[[URL] Fai clic qui] per rinnovare l'abbonamento.
24552455

2456-
Se sei un membro Premium, [[PREMIUM_URL] fai clic qui] per ricevere in regalo la manipolazione vocale.</notification>
2457-
<notification name="VoiceEffectsWillExpire">Almeno una delle tue manipolazioni vocali scadrà tra meno di [INTERVAL] giorni.
2458-
[[URL] Fai clic qui] per rinnovare l'abbonamento.
2459-
24602456
Se sei un membro Premium, [[PREMIUM_URL] fai clic qui] per ricevere in regalo la manipolazione vocale.</notification>
24612457
<notification name="VoiceEffectsNew">Sono disponibili nuove manipolazioni vocali.</notification>
24622458
<notification name="Cannot enter parcel: not a group member">Soltanto i membri di un determinato gruppo possono visitare questa zona.</notification>

‎indra/newview/skins/default/xui/ja/notifications.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4655,17 +4655,6 @@ Webページにリンクすると、他人がこの場所に簡単にアクセ
46554655
<notification name="VoiceEffectsExpiredInUse">ボイスモーフィング効果の有効期限が終了したため、あなたの通常のボイス設定が適用されました。
46564656
期限を延長・更新するには[[URL] ここ]をクリックしてください。
46574657

4658-
プレミアム会員の方は、[[PREMIUM_URL] ここ]をクリックしてボイスモーフィング特典をお受け取りください。
4659-
<tag>
4660-
fail
4661-
</tag>
4662-
<tag>
4663-
voice
4664-
</tag>
4665-
</notification>
4666-
<notification name="VoiceEffectsWillExpire">ボイスモーフィング効果の１つ、または複数の有効期限が[INTERVAL]日以内に終了します。
4667-
期限を延長・更新するには[[URL] ここ]をクリックしてください。
4668-
46694658
プレミアム会員の方は、[[PREMIUM_URL] ここ]をクリックしてボイスモーフィング特典をお受け取りください。
46704659
<tag>
46714660
fail

0 commit comments

Comments
 (0)