diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-18 15:36:11 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-11-18 15:36:11 -0800 |
| commit | 6802775bc4952874e26f320e1ec7ce9f7ed2e2fb (patch) | |
| tree | fb5b9b355214fe5ab949ff62ad5146d49557c2e0 /indra/newview/skins | |
| parent | 327a922dc9cda771077826ecf7521464ebd281c0 (diff) | |
| parent | 0e52564f0a36365c2ce5f5263d15778394741fde (diff) | |
Merge with viewer-development
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 8 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_setup.xml | 16 |
2 files changed, 24 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 1247e4724e..94539fb278 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2870,6 +2870,14 @@ Download to your Applications folder? </notification> <notification + icon="notifytip.tga" + name="DownloadBackground" + type="notifytip"> +An updated version of [APP_NAME] has been downloaded. +It will be applied the next time you restart [APP_NAME] + </notification> + + <notification icon="alertmodal.tga" name="DeedObjectToGroup" type="alertmodal"> 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 14aa38c5d3..584bd1ea9d 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -341,4 +341,20 @@ name="web_proxy_port" top_delta="0" width="145" /> + + <check_box + top_delta="2" + enabled="true" + follows="left|top" + height="18" + initial_value="true" + control_name="UpdaterServiceActive" + label="Automatically download and install [APP_NAME] updates" + left="30" + mouse_opaque="true" + name="updater_service_active" + radio_style="false" + width="400" + top_pad="10"/> + </panel> |