From 55c935ea764bc349fa5a329bf190cc6d00f343ca Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Mon, 24 May 2010 10:55:41 +0100
Subject: EXT-7335 WIP Changed VoiceEffectExpiryWarningTime from F32 to S32

---
 indra/newview/app_settings/settings.xml |  4 ++--
 indra/newview/llvoicevivox.cpp          | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index ac289a4fc2..6fa96a653b 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10591,9 +10591,9 @@
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>F32</string>
+      <string>S32</string>
       <key>Value</key>
-      <real>259200.0</real>
+      <integer>259200</integer>
     </map>
     <key>VoiceMorphingEnabled</key>
     <map>
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 240d7ff164..c8402af5d1 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -6597,11 +6597,11 @@ void LLVivoxVoiceClient::addVoiceFont(const S32 font_index,
 		font->mExpiryTimer.setTimerExpirySec(expiry_time);
 
 		// Set the warning timer to some interval before actual expiry.
-		F64 warning_time = (F64)gSavedSettings.getF32("VoiceEffectExpiryWarningTime");
-		if (warning_time > 0.f)
+		S32 warning_time = gSavedSettings.getS32("VoiceEffectExpiryWarningTime");
+		if (warning_time > 0)
 		{
 			font->mExpiryWarningTimer.start();
-			expiry_time = (expiration_date.secondsSinceEpoch() - warning_time)
+			expiry_time = (expiration_date.secondsSinceEpoch() - (F64)warning_time)
 							- LLTimer::getTotalSeconds();
 			font->mExpiryWarningTimer.setTimerExpirySec(expiry_time);
 		}
@@ -6704,8 +6704,8 @@ void LLVivoxVoiceClient::expireVoiceFonts()
 	// Give a warning notification if any voice fonts are due to expire.
 	if (will_expire)
 	{
-		S32 seconds = gSavedSettings.getF32("VoiceEffectExpiryWarningTime");
-		args["INTERVAL"] = llformat("%d", (seconds / SEC_PER_DAY));
+		S32 seconds = gSavedSettings.getS32("VoiceEffectExpiryWarningTime");
+		args["INTERVAL"] = llformat("%d", seconds / SEC_PER_DAY);
 
 		LLNotificationsUtil::add("VoiceEffectsWillExpire", args);
 	}
-- 
cgit v1.2.3