diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-04-02 14:57:12 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-04-02 14:57:12 -0700 |
| commit | 98e46e28e05c22c02da41603a056c0caf34f5ad0 (patch) | |
| tree | a24352a4ce377d91428554aab15f96f887b24514 /indra/newview/llnotificationofferhandler.cpp | |
| parent | 9e1b600d9b41afea62b2ba68fa8d5bc5861d1111 (diff) | |
| parent | 2c5c563319d5ba8eaeae93b627536321956d347e (diff) | |
Merge with tip
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") |