summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorBrian McGroarty <soft@lindenlab.com>2008-05-07 17:17:42 +0000
committerBrian McGroarty <soft@lindenlab.com>2008-05-07 17:17:42 +0000
commite1e1212daae33723e7da325f295a5c3a6bb78979 (patch)
tree95139904e71995519db2fc6e056940b2f40e73a3 /indra/newview/app_settings
parent41927004751731d2d0cb74989ded36878292ee4e (diff)
QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-7-sandbox-84884 -- dataserver-is-deprecated
Diffstat (limited to 'indra/newview/app_settings')
-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 f1e4b39d7d..f53ec84fd1 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3808,6 +3808,17 @@
<key>Value</key>
<string>default</string>
</map>
+ <key>LanguageIsPublic</key>
+ <map>
+ <key>Comment</key>
+ <string>Let other residents see our language information</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
<key>LastFeatureVersion</key>
<map>
<key>Comment</key>