diff options
| -rw-r--r-- | autobuild.xml | 10 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_setup.xml | 8 |
3 files changed, 11 insertions, 13 deletions
diff --git a/autobuild.xml b/autobuild.xml index 03f1a4cbb8..5824e2bd4c 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3150,9 +3150,9 @@ <key>archive</key> <map> <key>hash</key> - <string>0a5cc9172214a0a20f2d78f5cb16844d</string> + <string>f79a0fbea49e9eb33878516903ff7d67</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/8213/32619/viewer_manager-1.0.508202-darwin64-508202.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/8347/33513/viewer_manager-1.0.508336-darwin64-508336.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3174,9 +3174,9 @@ <key>archive</key> <map> <key>hash</key> - <string>ca78e324fe75ac097bdbadb91181cfa7</string> + <string>aca64869f8ead9ad68a7cccf163dd7b7</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/8216/32625/viewer_manager-1.0.508202-windows-508202.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/8348/33519/viewer_manager-1.0.508336-windows-508336.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -3187,7 +3187,7 @@ <key>source_type</key> <string>hg</string> <key>version</key> - <string>1.0.508202</string> + <string>1.0.508336</string> </map> <key>vlc-bin</key> <map> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 203044ffec..cb4be8d9fc 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -13454,9 +13454,9 @@ <key>UpdaterServiceCheckPeriod</key> <map> <key>Comment</key> - <string>Default period between update checking.</string> + <string>Obsolete; no longer used.</string> <key>Persist</key> - <integer>1</integer> + <integer>0</integer> <key>Type</key> <string>U32</string> <key>Value</key> @@ -13476,7 +13476,7 @@ <key>UpdaterServicePath</key> <map> <key>Comment</key> - <string>Path on the update server host.</string> + <string>Obsolete: no longer used</string> <key>Persist</key> <integer>0</integer> <key>Type</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 71e4009571..1d4cbca1a5 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -246,17 +246,15 @@ name="updater_service_combobox" width="300"> <combo_box.item - label="Install automatically" + label="Install each update automatically" name="Install_automatically" value="3" /> - <!-- <combo_box.item - label="Ask before installing" + label="Ask me when an optional update is ready to install" name="Install_ask" value="1" /> - --> <combo_box.item - label="I will download and install updates manually" + label="Install only mandatory updates" name="Install_manual" value="0" /> </combo_box> |