diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-19 13:21:52 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-19 13:21:52 -0400 |
| commit | a3a430651780f82afb0fd355a0abe11d88f410d6 (patch) | |
| tree | a2ec3b87b2bff75904be0e7a6bf38d17c59edb68 /indra/newview/llnotificationtiphandler.cpp | |
| parent | b952a5e5851d1a8bc2a45f00248b051497fec71f (diff) | |
| parent | f50be64167c254e27f635ad47d8940551f0c6ab4 (diff) | |
automated merge viewer2.0->viewer2.0
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()) { |