diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-03-19 15:54:01 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-03-19 15:54:01 +0200 |
| commit | 5fa1c1531bbeb23aa76ba605fb7bd30b3f51c6dd (patch) | |
| tree | a9a354c260d649fd2ebc862b1703666b688c0461 /indra/newview/llnotificationtiphandler.cpp | |
| parent | 37812054480843bca8e9016e3f816e9fdee6e7d3 (diff) | |
| parent | 97a35b487545572ce9409e06bd54ad29f0da7114 (diff) | |
Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llnotificationtiphandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationtiphandler.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp index 4e2c5085ed..1f1afe293a 100644 --- a/indra/newview/llnotificationtiphandler.cpp +++ b/indra/newview/llnotificationtiphandler.cpp @@ -150,6 +150,12 @@ bool LLTipHandler::processNotification(const LLSD& notify) LLHandlerUtil::spawnIMSession(name, from_id); } + // don't spawn toast for inventory accepted/declined offers if respective IM window is open (EXT-5909) + if (!LLHandlerUtil::canSpawnToast(notification)) + { + return true; + } + LLToastPanel* notify_box = NULL; if("FriendOffline" == notification->getName() || "FriendOnline" == notification->getName()) { |