diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-11-18 15:40:36 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-11-18 15:40:36 -0800 |
| commit | cd30239eda5d8969db02c2c56d95332dd5039bb0 (patch) | |
| tree | 54f49de82bfde61bd9520aef057abab8ea6a7f8f /indra/newview | |
| parent | 0e52564f0a36365c2ce5f5263d15778394741fde (diff) | |
| parent | 86e84a1313f9fcb78b3e6b490dcf1604829ef175 (diff) | |
Automated merge with https://bitbucket.org/mani_linden/viewer-development/
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 16 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 10 |
2 files changed, 24 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 548bebcfa9..b5238e6d2c 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2390,8 +2390,20 @@ namespace { // do we need a file llupdaterui.cpp or something? -brad bool notify_update(LLSD const & evt) { - LLNotificationsUtil::add("DownloadBackground"); - // let others also handle this event by default + switch (evt["type"].asInteger()) + { + case LLUpdaterService::DOWNLOAD_COMPLETE: + LLNotificationsUtil::add("DownloadBackground"); + break; + case LLUpdaterService::INSTALL_ERROR: + LLNotificationsUtil::add("FailedUpdateInstall"); + break; + default: + llinfos << "unhandled update event " << evt << llendl; + break; + } + + // let others also handle this event by default return false; } }; diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 40d5f75de2..a342db8442 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2870,6 +2870,16 @@ Download to your Applications folder? </notification> <notification + icon="alertmodal.tga" + name="FailedUpdateInstall" + type="alertmodal"> +Gadzooks, I failed to install the latest update. +Get thee to the interwebs and install it thyself. + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> + <notification icon="notifytip.tga" name="DownloadBackground" type="notifytip"> |