2 files changed, 53 insertions, 37 deletions

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 5bd0a0d297..eb8d87e184 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2417,55 +2417,71 @@ namespace {
 		LLUpdaterService().startChecking(install_if_ready);
 	}
 	
-	void on_required_update_downloaded(LLSD const & data)
+	void on_update_downloaded(LLSD const & data)
 	{
 		std::string notification_name;
-		if(LLStartUp::getStartupState() <= STATE_LOGIN_WAIT)
+		void (*apply_callback)(LLSD const &, LLSD const &) = NULL;
+
+		if(data["required"].asBoolean())
 		{
-			// The user never saw the progress bar.
-			notification_name = "RequiredUpdateDownloadedVerboseDialog";
+			apply_callback = &apply_update_ok_callback;
+			if(LLStartUp::getStartupState() <= STATE_LOGIN_WAIT)
+			{
+				// The user never saw the progress bar.
+				notification_name = "RequiredUpdateDownloadedVerboseDialog";
+			}
+			else
+			{
+				notification_name = "RequiredUpdateDownloadedDialog";
+			}
 		}
 		else
 		{
-			notification_name = "RequiredUpdateDownloadedDialog";
+			apply_callback = &apply_update_callback;
+			if(LLStartUp::getStartupState() < STATE_STARTED)
+			{
+				// CHOP-262 we need to use a different notification
+				// method prior to login.
+				notification_name = "DownloadBackgroundDialog";
+			}
+			else
+			{
+				notification_name = "DownloadBackgroundTip";
+			}
 		}
+
 		LLSD substitutions;
 		substitutions["VERSION"] = data["version"];
-		LLNotificationsUtil::add(notification_name, substitutions, LLSD(), &apply_update_ok_callback);
-	}
-	
-	void on_optional_update_downloaded(LLSD const & data)
-	{
-		std::string notification_name;
-		if(LLStartUp::getStartupState() < STATE_STARTED)
-		{
-			// CHOP-262 we need to use a different notification
-			// method prior to login.
-			notification_name = "DownloadBackgroundDialog";
-		}
-		else
+
+		// truncate version at the rightmost '.' 
+		std::string version_short(data["version"]);
+		size_t short_length = version_short.rfind('.');
+		if (short_length != std::string::npos)
 		{
-			notification_name = "DownloadBackgroundTip";
+			version_short.resize(short_length);
 		}
-		LLSD substitutions;
-		substitutions["VERSION"] = data["version"];
-		LLNotificationsUtil::add(notification_name, substitutions, LLSD(), apply_update_callback);
-	}
 
+		LLUIString relnotes_url("[RELEASE_NOTES_BASE_URL][CHANNEL_URL]/[VERSION_SHORT]");
+		relnotes_url.setArg("[VERSION_SHORT]", version_short);
+
+		// *TODO thread the update service's response through to this point
+		std::string const & channel = LLVersionInfo::getChannel();
+		boost::shared_ptr<char> channel_escaped(curl_escape(channel.c_str(), channel.size()), &curl_free);
+
+		relnotes_url.setArg("[CHANNEL_URL]", channel_escaped.get());
+		relnotes_url.setArg("[RELEASE_NOTES_BASE_URL]", LLTrans::getString("RELEASE_NOTES_BASE_URL"));
+		substitutions["RELEASE_NOTES_FULL_URL"] = relnotes_url.getString();
+
+		LLNotificationsUtil::add(notification_name, substitutions, LLSD(), apply_callback);
+	}
+	
     bool notify_update(LLSD const & evt)
     {
 		std::string notification_name;
 		switch (evt["type"].asInteger())
 		{
 			case LLUpdaterService::DOWNLOAD_COMPLETE:
-				if(evt["required"].asBoolean())
-				{
-					on_required_update_downloaded(evt);
-				}
-				else
-				{
-					on_optional_update_downloaded(evt);
-				}
+				on_update_downloaded(evt);
 				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 eecbeeb8dc..b0bb93c13a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2906,20 +2906,20 @@ or you can install it now.
    icon="notify.tga"
    name="DownloadBackgroundTip"
    type="notify">
-We have downloaded and update to your [APP_NAME] installation.
-Version [VERSION]
+We have downloaded an update to your [APP_NAME] installation.
+Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
     <usetemplate
      name="okcancelbuttons"
-     notext="Wait"
-     yestext="Restart Now"/>
+     notext="Later..."
+     yestext="Install now and restart [APP_NAME]"/>
   </notification>
 
   <notification
  icon="alertmodal.tga"
  name="DownloadBackgroundDialog"
  type="alertmodal">
-We have downloaded and update to your [APP_NAME] installation.
-Version [VERSION]
+We have downloaded an update to your [APP_NAME] installation.
+Version [VERSION] [[RELEASE_NOTES_FULL_URL] Information about this update]
     <usetemplate
      name="okcancelbuttons"
      notext="Later..."