diff options
| author | James Cook <james@lindenlab.com> | 2008-10-28 23:56:20 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2008-10-28 23:56:20 +0000 |
| commit | b406972af1ce404b19639cdbe955f07d2f8fb61f (patch) | |
| tree | 7bc82814b795f608b341a4402b0390fe285bee5f /indra/newview/app_settings/settings.xml | |
| parent | 7a9360c8bc5b5819aec805cf1583fa7c84ea02ea (diff) | |
svn merge -r100302:100467 installer-james-combo-merge for QAR-972, incorporating:
QAR-892 Windows installer that pings secondlife.com on launch
QAR-837 Six New Languages in the Installer
QAR-908 downloader-support-1 merge
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 07fa71ce38..72e16ea70c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3595,6 +3595,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>ForceMandatoryUpdate</key> + <map> + <key>Comment</key> + <string>For QA: On next startup, forces the auto-updater to run</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>ForwardBtnRect</key> <map> <key>Comment</key> @@ -4178,7 +4189,7 @@ <key>Type</key> <string>String</string> <key>Value</key> - <string>https://wiki.secondlife.com/wiki/[LSL_STRING]</string> + <string>http://wiki.secondlife.com/wiki/[LSL_STRING]</string> </map> <key>LagMeterShrunk</key> <map> |