diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-21 17:13:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-21 17:13:26 -0400 |
| commit | f9bdc6d5e13854edca343440a61f7589efe65263 (patch) | |
| tree | 58843a8c796cdbb230c9ae420a6377868b63e2db /indra/newview | |
| parent | c0bd675fdba88ac66ed9c9b89b4e6f6e4c8b706b (diff) | |
| parent | 187c7042b98ce393b16d4277fd024d99e5cad0c5 (diff) | |
merge changes for chop-948
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_preferences_setup.xml | 3 |
2 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 31c730e0bc..b3538bf069 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12494,6 +12494,17 @@ <key>Value</key> <string>update</string> </map> + <key>UpdaterWillingToTest</key> + <map> + <key>Comment</key> + <string>Whether or not the updater should offer test candidate upgrades.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <string>1</string> + </map> <key>UploadBakedTexOld</key> <map> <key>Comment</key> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index 2fb6a9fd40..dd4533ae74 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -237,8 +237,7 @@ enabled="true" follows="left|top" height="14" - initial_value="true" - control_name="UpdateWillingToTest" + control_name="UpdaterWillingToTest" label="Willing to update to release candidates" left_delta="0" mouse_opaque="true" |