MAINT-6097 FIXED On required update, clicking link to release notes opens browser behind menu

9 files changed, 55 insertions, 23 deletions

diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 77e7d375c8..0cb959a315 100755
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -417,6 +417,7 @@ LLNotificationTemplate::LLNotificationTemplate(const LLNotificationTemplate::Par
 	mExpireOption(p.expire_option),
 	mURLOption(p.url.option),
 	mURLTarget(p.url.target),
+	mForceUrlsExternal(p.force_urls_external),
 	mUnique(p.unique.isProvided()),
 	mCombineBehavior(p.unique.combine),
 	mPriority(p.priority),
@@ -748,6 +749,11 @@ S32 LLNotification::getURLOpenExternally() const
 	return(mTemplatep? mTemplatep->mURLTarget == "_external": -1);
 }
 
+bool LLNotification::getForceUrlsExternal() const
+{
+    return (mTemplatep ? mTemplatep->mForceUrlsExternal : false);
+}
+
 bool LLNotification::hasUniquenessConstraints() const 
 { 
 	return (mTemplatep ? mTemplatep->mUnique : false);
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 010e6caba2..354add0b82 100755
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -553,7 +553,8 @@ public:
 	std::string getLabel() const;
 	std::string getURL() const;
 	S32 getURLOption() const;
-    S32 getURLOpenExternally() const;
+	S32 getURLOpenExternally() const; //for url responce option
+	bool getForceUrlsExternal() const;
 	bool canLogToChat() const;
 	bool canLogToIM() const;
 	bool canShowToast() const;
diff --git a/indra/llui/llnotificationtemplate.h b/indra/llui/llnotificationtemplate.h
index c23fc53763..bed29254d8 100755
--- a/indra/llui/llnotificationtemplate.h
+++ b/indra/llui/llnotificationtemplate.h
@@ -177,7 +177,8 @@ struct LLNotificationTemplate
 		Optional<bool>					persist,
 										log_to_im,
 										show_toast,
-										log_to_chat;
+										log_to_chat,
+										force_urls_external;
 		Optional<std::string>			functor,
 										icon,
 										label,
@@ -201,6 +202,7 @@ struct LLNotificationTemplate
 			log_to_im("log_to_im", false),
 			show_toast("show_toast", true),
 			log_to_chat("log_to_chat", true),
+			force_urls_external("force_urls_external", false),
 			functor("functor"),
 			icon("icon"),
 			label("label"),
@@ -284,11 +286,16 @@ struct LLNotificationTemplate
     // that URL. Obsolete this and eliminate the buttons for affected
     // messages when we allow clickable URLs in the UI
     U32 mURLOption;
-	
-	std::string mURLTarget;
-	//This is a flag that tells if the url needs to open externally dispite 
+
+	//This is a flag that tells if option url needs to open externally dispite 
 	//what the user setting is.
-	
+	std::string mURLTarget;
+
+	// All links clicked inside notification will be opened in external browser
+	// Note: Some notifications block and exit viewer, yet they provide a link
+	// to click, we should be able to open such links in external browser.
+	bool mForceUrlsExternal;
+
 	// does this notification persist across sessions? if so, it will be
 	// serialized to disk on first receipt and read on startup
 	bool mPersist;
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 4309e6557e..4ccf1ef009 100755
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -164,6 +164,7 @@ LLTextBase::Params::Params()
 	trusted_content("trusted_content", true),
 	use_ellipses("use_ellipses", false),
 	parse_urls("parse_urls", false),
+	force_urls_external("force_urls_external", false),
 	parse_highlights("parse_highlights", false)
 {
 	addSynonym(track_end, "track_bottom");
@@ -216,6 +217,7 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
 	mWordWrap(p.wrap),
 	mUseEllipses( p.use_ellipses ),
 	mParseHTML(p.parse_urls),
+	mForceUrlsExternal(p.force_urls_external),
 	mParseHighlights(p.parse_highlights),
 	mBGVisible(p.bg_visible),
 	mScroller(NULL),
@@ -1937,7 +1939,7 @@ void LLTextBase::createUrlContextMenu(S32 x, S32 y, const std::string &in_url)
 	registrar.add("Url.Open", boost::bind(&LLUrlAction::openURL, url));
 	registrar.add("Url.OpenInternal", boost::bind(&LLUrlAction::openURLInternal, url));
 	registrar.add("Url.OpenExternal", boost::bind(&LLUrlAction::openURLExternal, url));
-	registrar.add("Url.Execute", boost::bind(&LLUrlAction::executeSLURL, url));
+	registrar.add("Url.Execute", boost::bind(&LLUrlAction::executeSLURL, url, true));
 	registrar.add("Url.Block", boost::bind(&LLUrlAction::blockObject, url));
 	registrar.add("Url.Teleport", boost::bind(&LLUrlAction::teleportToLocation, url));
 	registrar.add("Url.ShowProfile", boost::bind(&LLUrlAction::showProfile, url));
@@ -3227,7 +3229,15 @@ BOOL LLNormalTextSegment::handleMouseUp(S32 x, S32 y, MASK mask)
 		// Only process the click if it's actually in this segment, not to the right of the end-of-line.
 		if(mEditor.getSegmentAtLocalPos(x, y, false) == this)
 		{
-			LLUrlAction::clickAction(getStyle()->getLinkHREF(), mEditor.isContentTrusted());
+            std::string url = getStyle()->getLinkHREF();
+            if (!mEditor.mForceUrlsExternal)
+            {
+                LLUrlAction::clickAction(url, mEditor.isContentTrusted());
+            }
+            else if (!LLUrlAction::executeSLURL(url, mEditor.isContentTrusted()))
+            {
+                LLUrlAction::openURLExternal(url);
+            }
 			return TRUE;
 		}
 	}
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index ac408bbe7a..7d87271b0e 100755
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -300,6 +300,7 @@ public:
 								wrap,
 								use_ellipses,
 								parse_urls,
+								force_urls_external,
 								parse_highlights,
 								clip,
 								clip_partial,
@@ -654,6 +655,7 @@ protected:
 	S32							mLineSpacingPixels;	// padding between lines
 	bool						mBorderVisible;
 	bool                		mParseHTML;			// make URLs interactive
+	bool						mForceUrlsExternal; // URLs from this textbox will be opened in external browser
 	bool						mParseHighlights;	// highlight user-defined keywords
 	bool                		mWordWrap;
 	bool						mUseEllipses;
diff --git a/indra/llui/llurlaction.cpp b/indra/llui/llurlaction.cpp
index 12537d9dd1..027a3e3a64 100755
--- a/indra/llui/llurlaction.cpp
+++ b/indra/llui/llurlaction.cpp
@@ -83,12 +83,13 @@ void LLUrlAction::openURLExternal(std::string url)
 	}
 }
 
-void LLUrlAction::executeSLURL(std::string url)
+bool LLUrlAction::executeSLURL(std::string url, bool trusted_content)
 {
 	if (sExecuteSLURLCallback)
 	{
-		sExecuteSLURLCallback(url ,true);
+		return sExecuteSLURLCallback(url, trusted_content);
 	}
+	return false;
 }
 
 void LLUrlAction::clickAction(std::string url, bool trusted_content)
diff --git a/indra/llui/llurlaction.h b/indra/llui/llurlaction.h
index 5f3626490c..5497e28bb4 100755
--- a/indra/llui/llurlaction.h
+++ b/indra/llui/llurlaction.h
@@ -57,7 +57,7 @@ public:
 	static void openURLExternal(std::string url);
 
 	/// execute the given secondlife: SLURL
-	static void executeSLURL(std::string url);
+	static bool executeSLURL(std::string url, bool trusted_content = true);
 
 	/// if the Url specifies an SL location, teleport there
 	static void teleportToLocation(std::string url);
diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp
index 530bd9a18f..bbce717c20 100755
--- a/indra/newview/lltoastalertpanel.cpp
+++ b/indra/newview/lltoastalertpanel.cpp
@@ -181,6 +181,7 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal
 	params.wrap(true);
 	params.follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP);
 	params.allow_scroll(true);
+	params.force_urls_external(mNotification->getForceUrlsExternal());
 
 	LLTextBox * msg_box = LLUICtrlFactory::create<LLTextBox> (params);
 	// Compute max allowable height for the dialog text, so we can allocate
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f1a6aca163..3831b52c2c 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3870,9 +3870,10 @@ We have downloaded an update to your [APP_NAME] installation.
   </notification>
   
   <notification
- icon="alertmodal.tga"
- name="RequiredUpdateDownloadedVerboseDialog"
- type="alertmodal">
+   icon="alertmodal.tga"
+   name="RequiredUpdateDownloadedVerboseDialog"
+   type="alertmodal"
+   force_urls_external="true">
 We have downloaded a required software update.
 Version [VERSION] [[INFO_URL] Information about this update]
 
@@ -3884,9 +3885,10 @@ We must restart [APP_NAME] to install the update.
   </notification>
   
   <notification
- icon="alertmodal.tga"
- name="RequiredUpdateDownloadedDialog"
- type="alertmodal">
+   icon="alertmodal.tga"
+   name="RequiredUpdateDownloadedDialog"
+   type="alertmodal"
+   force_urls_external="true">
 We must restart [APP_NAME] to install the update.
 [[INFO_URL] Information about this update]
     <tag>confirm</tag>
@@ -3926,9 +3928,10 @@ see [[INFO_URL] Information about this update]
   </notification>
   
   <notification
- icon="alertmodal.tga"
- name="OtherChannelRequiredUpdateDownloadedVerboseDialog"
- type="alertmodal">
+   icon="alertmodal.tga"
+   name="OtherChannelRequiredUpdateDownloadedVerboseDialog"
+   type="alertmodal"
+   force_urls_external="true">
 We have downloaded a required software update.
 Version [VERSION]
 This experimental viewer has been replaced by a [NEW_CHANNEL] viewer;
@@ -3942,9 +3945,10 @@ We must restart [APP_NAME] to install the update.
   </notification>
   
   <notification
- icon="alertmodal.tga"
- name="OtherChannelRequiredUpdateDownloadedDialog"
- type="alertmodal">
+   icon="alertmodal.tga"
+   name="OtherChannelRequiredUpdateDownloadedDialog"
+   type="alertmodal"
+   force_urls_external="true">
 We must restart [APP_NAME] to install the update.
 This experimental viewer has been replaced by a [NEW_CHANNEL] viewer;
 see [[INFO_URL] Information about this update]