diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-01 17:12:12 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-01 17:12:12 +0100 |
| commit | 569f322f0d43ba4e1f079d362d333af5b84a0e32 (patch) | |
| tree | 7141309c52129400982944d1f91667b74d65c6cb /indra/newview/llnotificationofferhandler.cpp | |
| parent | 8421d3dcd3aad07efecbfa490ccc8e71119b9cab (diff) | |
| parent | b98ebdecda66a1f08e74321cb255e39edfbc47dd (diff) | |
PE merge
Diffstat (limited to 'indra/newview/llnotificationofferhandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationofferhandler.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp index e93aec9d01..c5960a9040 100644 --- a/indra/newview/llnotificationofferhandler.cpp +++ b/indra/newview/llnotificationofferhandler.cpp @@ -115,15 +115,11 @@ bool LLOfferHandler::processNotification(const LLSD& notify) session_id = LLHandlerUtil::spawnIMSession(name, from_id); } - bool show_toast = true; + bool show_toast = LLHandlerUtil::canSpawnToast(notification); bool add_notid_to_im = LLHandlerUtil::canAddNotifPanelToIM(notification); if (add_notid_to_im) { LLHandlerUtil::addNotifPanelToIM(notification); - if (LLHandlerUtil::isIMFloaterOpened(notification)) - { - show_toast = false; - } } if (notification->getPayload().has("SUPPRESS_TOAST") |