diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-16 09:34:19 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-16 09:34:19 -0800 |
| commit | 1774489ef8c224359e39d6281497e5128b043d24 (patch) | |
| tree | ce5ed7ab9092d2f6aa8cc9cb4080f22c71827a8f /indra/newview | |
| parent | 6f996302ef5f8277dbfab9a75a536b554d7fa4e9 (diff) | |
Vary install failed message depending on whether it was required or not.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 11 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 13 |
2 files changed, 23 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 5cf7087c71..c9800c9830 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2475,6 +2475,11 @@ namespace { LLNotificationsUtil::add(notification_name, substitutions, LLSD(), apply_callback); } + + void install_error_callback(LLSD const & notification, LLSD const & response) + { + LLAppViewer::instance()->forceQuit(); + } bool notify_update(LLSD const & evt) { @@ -2485,7 +2490,11 @@ namespace { on_update_downloaded(evt); break; case LLUpdaterService::INSTALL_ERROR: - LLNotificationsUtil::add("FailedUpdateInstall"); + if(evt["required"].asBoolean()) { + LLNotificationsUtil::add("FailedRequiredUpdateInstall", LLSD(), LLSD(), &install_error_callback); + } else { + LLNotificationsUtil::add("FailedUpdateInstall"); + } break; default: break; diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index b0bb93c13a..fc5479a6f7 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2890,6 +2890,19 @@ http://secondlife.com/download. <notification icon="alertmodal.tga" + name="FailedRequiredUpdateInstall" + type="alertmodal"> +We were unable to install a required update. +You will be unable to log in until [APP_NAME] has been updated. +Please download and install the latest viewer from +http://secondlife.com/download. + <usetemplate + name="okbutton" + yestext="Quit"/> + </notification> + + <notification + icon="alertmodal.tga" name="UpdaterServiceNotRunning" type="alertmodal"> There is a required update for your Second Life Installation. |