diff options
author | Oz Linden <oz@lindenlab.com> | 2016-05-06 09:05:51 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2016-05-06 09:05:51 -0400 |
commit | a07a8cbf6eca73272f2c774df7122a1f0c5e1aa9 (patch) | |
tree | f716bdae5a265aabf8f9da1413df6a19fe3ada52 /indra/newview/lltoastalertpanel.cpp | |
parent | c938e165062cbe53065dcdaa434fc1c3d9f38774 (diff) | |
parent | 94559950a2c670990db56bd74e65d26652421b8c (diff) |
merge changes for 4.0.4-release
Diffstat (limited to 'indra/newview/lltoastalertpanel.cpp')
-rwxr-xr-x | indra/newview/lltoastalertpanel.cpp | 1 |
1 files changed, 1 insertions, 0 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 |