summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llappviewer.cpp16
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml10
2 files changed, 24 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 5f02b98c6f..1fd8b02530 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2393,8 +2393,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 94539fb278..0663583543 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">