diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-30 08:57:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-30 08:57:29 -0400 |
| commit | 889d02b52d9d53b59e1bab953b8e19a60c49fd4f (patch) | |
| tree | 7991f8b9b0972027cc2bc7301a99779e9850141f /indra/newview/app_settings | |
| parent | ca7de31a6c5031bb928d283362e96bb63e37ce85 (diff) | |
| parent | 2ef8fc41e74b6949e02a7715b2b8399094ebd3ea (diff) | |
merge changes for CHOP-913
Diffstat (limited to 'indra/newview/app_settings')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 02fada3761..31c730e0bc 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12450,6 +12450,17 @@ <key>Value</key> <integer>3</integer> </map> + <key>UpdaterWillingToTest</key> + <map> + <key>Comment</key> + <string>Allow upgrades to release candidate viewers with new features and fixes.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>UpdaterServiceCheckPeriod</key> <map> <key>Comment</key> @@ -12483,17 +12494,6 @@ <key>Value</key> <string>update</string> </map> - <key>UpdaterServiceProtocolVersion</key> - <map> - <key>Comment</key> - <string>The update protocol version to use.</string> - <key>Persist</key> - <integer>0</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string>v1.0</string> - </map> <key>UploadBakedTexOld</key> <map> <key>Comment</key> |