diff options
| author | callum_linden <none@none> | 2017-08-22 14:32:04 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2017-08-22 14:32:04 -0700 |
| commit | b5dbb9c52aa8f9379662f1ff1169adadcf8ac5f8 (patch) | |
| tree | 438d099240df63608825568d162874e186835994 /indra/newview/llnotificationofferhandler.cpp | |
| parent | 8e6751efced8d9f5ede5ec5d954ff809d56d1162 (diff) | |
| parent | 58176de9574164e31790a148d9b5489a129fc961 (diff) | |
Automated merge with head of ll/viewer64 after DRTVWR-439 merge
Diffstat (limited to 'indra/newview/llnotificationofferhandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationofferhandler.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp index 63ab88da42..14d25d8158 100644 --- a/indra/newview/llnotificationofferhandler.cpp +++ b/indra/newview/llnotificationofferhandler.cpp @@ -131,6 +131,7 @@ bool LLOfferHandler::processNotification(const LLNotificationPtr& notification) // we not save offer notifications to the syswell floater that should be added to the IM floater p.can_be_stored = !add_notif_to_im; p.force_show = notification->getOfferFromAgent(); + p.can_fade = notification->canFadeToast(); LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get()); if(channel) |