From 40e240fe61fe8ff989ac906969946d22a186bcf2 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Mon, 24 May 2010 03:00:29 +0100
Subject: EXT-7138 WIP Renamed VoiceEffectEnabled debug setting to
 VoiceMorphingEnabled. Hide Me->My Voice menu item when VoiceMorphing is
 disabled. Removed temporary VoiceFontsAvailable debug setting.

---
 indra/newview/app_settings/settings.xml | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'indra/newview/app_settings/settings.xml')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index cb9177587f..ac289a4fc2 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10584,21 +10584,21 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>VoiceFontsAvailable</key>
+    <key>VoiceEffectExpiryWarningTime</key>
     <map>
       <key>Comment</key>
-      <string>Temporary debug setting to test UI with no voice effects available.</string>
+      <string>How much notice to give of voice effect subscriptions expiry, in seconds.</string>
       <key>Persist</key>
-      <integer>0</integer>
+      <integer>1</integer>
       <key>Type</key>
-      <string>Boolean</string>
+      <string>F32</string>
       <key>Value</key>
-      <integer>1</integer>
+      <real>259200.0</real>
     </map>
-    <key>VoiceEffectEnabled</key>
+    <key>VoiceMorphingEnabled</key>
     <map>
       <key>Comment</key>
-      <string>Whether or not to use Voice Effects and show the UI.</string>
+      <string>Whether or not to enable Voice Effects and show the UI.</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
@@ -10606,17 +10606,6 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>VoiceEffectExpiryWarningTime</key>
-    <map>
-      <key>Comment</key>
-      <string>How much notice to give of voice effect subscriptions expiry, in seconds.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>259200.0</real>
-    </map>
     <key>AutoDisengageMic</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3