summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-01-15 10:42:09 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2013-01-15 10:42:09 -0800
commit028ceaef1441cbd2d87b294c6cfe7193a6b8bbd7 (patch)
tree7b35e8b814e41d1aef77a291249298a60c25a11e /indra/newview/app_settings
parent0e90e94a4d5cbac2d186f0056821a51078e8d1bd (diff)
parenta49d3b14254fa5cfac3900e86b2287a016eaf9cc (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings_per_account.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index 4ff494fbfb..6864328339 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -270,7 +270,18 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowFavoritesOnLogin</key>
+ <key>TranslatingEnabled</key>
+ <map>
+ <key>Comment</key>
+ <string>Translation prefs are set</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>ShowFavoritesOnLogin</key>
<map>
<key>Comment</key>
<string>Determines whether favorites of last logged in user will be saved on exit from viewer and shown on login screen</string>