summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-04-28 03:33:39 +0100
committerAimee Linden <aimee@lindenlab.com>2010-04-28 03:33:39 +0100
commitad24d0c72a272dd9b30841ecc20e34d334e6f2b6 (patch)
treebe61cfeea38ac280ca0332a002bc5f13f81d4106 /indra/newview/app_settings/settings.xml
parentfbc0e795b114ddbfb73cc62ce25a1e9a1cafacba (diff)
parentcacfa18643092547e7665b36d482ad9c8c5dfc54 (diff)
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a6dbe00759..e763f9cebc 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10405,6 +10405,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>VoiceFontDefault</key>
+ <map>
+ <key>Comment</key>
+ <string>Selected voice font</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string>00000000-0000-0000-0000-000000000000</string>
+ </map>
<key>AutoDisengageMic</key>
<map>
<key>Comment</key>