summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorBrian McGroarty <soft@lindenlab.com>2008-05-07 20:48:38 +0000
committerBrian McGroarty <soft@lindenlab.com>2008-05-07 20:48:38 +0000
commitd273ba2ce2707c6a2fe45c08fdc2524aae19ad00 (patch)
tree56b3723fed44031e888de9019b1ad127acdb1806 /indra/newview/app_settings
parente1e1212daae33723e7da325f295a5c3a6bb78979 (diff)
Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://svn.lindenlab.com/svn/linden/release dataserver-is-deprecated
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml11
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f53ec84fd1..f1e4b39d7d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -3808,17 +3808,6 @@
<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>