summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorAndrew Meadows <andrew@lindenlab.com>2010-09-13 09:16:49 -0700
committerAndrew Meadows <andrew@lindenlab.com>2010-09-13 09:16:49 -0700
commitc2f5bc0b129e0e0d2606a8e7849bbf37eb0276ea (patch)
treef139be7762d07c9b3331a3ff475a71c9156a6814 /indra/newview/app_settings
parenta6669cbd7905d75e5ff1ec596563bb6fad3c7642 (diff)
parent807aec7bafe19fca75a8f3980bd621fad7c8338e (diff)
Merge with http://hg.secondlife.com/viewer-development after migration
of Brad's simconsole work.
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml22
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 8fe33d4fa3..0bed37b96a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9869,6 +9869,28 @@
<key>Value</key>
<integer>1</integer>
</map>
+ <key>TranslateLanguage</key>
+ <map>
+ <key>Comment</key>
+ <string>Translate Language specifier</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string>default</string>
+ </map>
+ <key>TranslateChat</key>
+ <map>
+ <key>Comment</key>
+ <string>Translate incoming chat messages</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>TutorialURL</key>
<map>
<key>Comment</key>