diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-03-11 20:16:03 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-03-11 20:16:03 +0200 |
| commit | 230fc28d8a72e75a8f2af2ab5fa5ee0e3ccca4a1 (patch) | |
| tree | 67d9c4133c4c9fce49b326180b138ed75fa990df /indra/newview | |
| parent | debc51af6b6a35f7f635be9483a3bc4d0846a90d (diff) | |
MAINT-6097 FIXED On required update, clicking link to release notes opens browser behind menu
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/lltoastalertpanel.cpp | 1 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 28 |
2 files changed, 17 insertions, 12 deletions
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] |