5 files changed, 25 insertions, 6 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index f45bc474fc..08e40168c3 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2401,7 +2401,7 @@ namespace {
 		switch (evt["type"].asInteger())
 		{
 			case LLUpdaterService::DOWNLOAD_COMPLETE:
-				LLNotificationsUtil::add("DownloadBackground");
+				LLNotificationsUtil::add("DownloadBackgroundDialog");
 				break;
 			case LLUpdaterService::INSTALL_ERROR:
 				LLNotificationsUtil::add("FailedUpdateInstall");
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index bac1ad18d9..e333c891a4 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2902,10 +2902,26 @@ updater service to fetch and install the update?
 
   <notification
    icon="notifytip.tga"
-   name="DownloadBackground"
+   name="DownloadBackgroundTip"
    type="notifytip">
 An updated version of [APP_NAME] has been downloaded.
 It will be applied the next time you restart [APP_NAME]
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Wait"
+     yestext="Restart Now"/>
+  </notification>
+
+  <notification
+ icon="alertmodal.tga"
+ name="DownloadBackgroundDialog"
+ type="alertmodal">
+    An updated version of [APP_NAME] has been downloaded.
+    It will be applied the next time you restart [APP_NAME]
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Wait"
+     yestext="Restart Now"/>
   </notification>
 
   <notification
diff --git a/indra/viewer_components/updater/llupdatedownloader.cpp b/indra/viewer_components/updater/llupdatedownloader.cpp
index 7b0f960ce4..ddc14129c2 100644
--- a/indra/viewer_components/updater/llupdatedownloader.cpp
+++ b/indra/viewer_components/updater/llupdatedownloader.cpp
@@ -24,6 +24,9 @@
  */
 
 #include "linden_common.h"
+
+#include "llupdatedownloader.h"
+
 #include <stdexcept>
 #include <boost/format.hpp>
 #include <boost/lexical_cast.hpp>
@@ -35,7 +38,6 @@
 #include "llsd.h"
 #include "llsdserialize.h"
 #include "llthread.h"
-#include "llupdatedownloader.h"
 #include "llupdaterservice.h"
 
 
diff --git a/indra/viewer_components/updater/llupdaterservice.cpp b/indra/viewer_components/updater/llupdaterservice.cpp
index 92a0a09137..dd93fa2550 100644
--- a/indra/viewer_components/updater/llupdaterservice.cpp
+++ b/indra/viewer_components/updater/llupdaterservice.cpp
@@ -25,10 +25,11 @@
 
 #include "linden_common.h"
 
+#include "llupdaterservice.h"
+
 #include "llupdatedownloader.h"
 #include "llevents.h"
 #include "lltimer.h"
-#include "llupdaterservice.h"
 #include "llupdatechecker.h"
 #include "llupdateinstaller.h"
 #include "llversionviewer.h"
@@ -419,7 +420,7 @@ void LLUpdaterServiceImpl::downloadError(std::string const & message)
 	event["payload"] = payload;
 	LLEventPumps::instance().obtain("mainlooprepeater").post(event);
 
-	setState(LLUpdaterService::ERROR);
+	setState(LLUpdaterService::FAILURE);
 }
 
 void LLUpdaterServiceImpl::restartTimer(unsigned int seconds)
diff --git a/indra/viewer_components/updater/llupdaterservice.h b/indra/viewer_components/updater/llupdaterservice.h
index 3763fbfde0..8b76a9d1e7 100644
--- a/indra/viewer_components/updater/llupdaterservice.h
+++ b/indra/viewer_components/updater/llupdaterservice.h
@@ -63,7 +63,7 @@ public:
 		INSTALLING,
 		UP_TO_DATE,
 		TERMINAL,
-		ERROR
+		FAILURE
 	};
 
 	LLUpdaterService();