diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-01 15:33:05 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-01 15:33:05 -0700 |
| commit | db0ffdf270f9f9b656333e317a0cf6fadc14a711 (patch) | |
| tree | 6008b6b3c36dd9cd6bd7e51d63aea7210396e7bf /indra/newview/llnotificationofferhandler.cpp | |
| parent | 959ec0c305914ac71caa12920ca81230d5d9a6c4 (diff) | |
| parent | 406b595e8c6811c2550340ba316328289d8b856f (diff) | |
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") |