diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-11 17:53:49 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-11 17:53:49 +0200 |
| commit | e7027a57e17b565f98f401f3f2cd1af8c91f2af7 (patch) | |
| tree | 50f0b81fd9e580c52b068d7329a243ce5794e1fa /indra/newview/llnotificationofferhandler.cpp | |
| parent | 51ae05baa8622a3cf175009469c1787406221ca5 (diff) | |
fixed EXT-5904 “Offers embedding into IM windows”,
revised embedding and logging offer notification to provide loading log entry
in case notification doesn't exist;
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llnotificationofferhandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationofferhandler.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/llnotificationofferhandler.cpp b/indra/newview/llnotificationofferhandler.cpp index 97a1df66df..0a42d8adbe 100644 --- a/indra/newview/llnotificationofferhandler.cpp +++ b/indra/newview/llnotificationofferhandler.cpp @@ -156,7 +156,8 @@ bool LLOfferHandler::processNotification(const LLSD& notify) if (LLHandlerUtil::canLogToIM(notification)) { - if (LLHandlerUtil::isIMFloaterOpened(notification)) + // log only to file if notif panel can be embedded to IM and IM is opened + if (add_notid_to_im && LLHandlerUtil::isIMFloaterOpened(notification)) { LLHandlerUtil::logToIMP2P(notification, true); } @@ -165,12 +166,6 @@ bool LLOfferHandler::processNotification(const LLSD& notify) LLHandlerUtil::logToIMP2P(notification); } } - - // update IM floater messages if need - if (add_notid_to_im) - { - LLHandlerUtil::updateVisibleIMFLoaterMesages(notification); - } } } else if (notify["sigtype"].asString() == "delete") |