From 2a92d622d710ec4f83b3c9b5568d508067bf7107 Mon Sep 17 00:00:00 2001
From: "Mark Palange (Mani)" <palange@lindenlab.com>
Date: Mon, 6 Dec 2010 16:42:06 -0800
Subject: CHOP-257 - programmer XUI for update ready to install. One tip, one
 alert. Rev. by Brad

---
 indra/newview/llappviewer.cpp                        |  2 +-
 indra/newview/skins/default/xui/en/notifications.xml | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 63b2fcefd7..31115a4218 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2396,7 +2396,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 60b876d163..2d635bab76 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2887,12 +2887,29 @@ http://secondlife.com/download.
      name="okbutton"
      yestext="OK"/>
   </notification>
+
   <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
-- 
cgit v1.2.3