diff options
author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-05-10 16:09:25 +0300 |
---|---|---|
committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-05-10 16:09:25 +0300 |
commit | b1243c55e5579f72e3dd9dafe2b53173349a047f (patch) | |
tree | 9d9e0b018059483973a8e6f76644b0875d2534a3 /indra/llui/llnotifications.cpp | |
parent | 042930b59a82f706f16e4b67a683697aed65112f (diff) | |
parent | 7f5e6cea124e1193b199a3eabd50bdab96340c13 (diff) |
Merged in oz_linden/maint-5974
Diffstat (limited to 'indra/llui/llnotifications.cpp')
-rwxr-xr-x | indra/llui/llnotifications.cpp | 6 |
1 files changed, 6 insertions, 0 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); |