diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-19 11:27:10 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-19 11:27:10 -0400 |
| commit | 5e0be34c26f384a111063399b619c82b2a951dcd (patch) | |
| tree | 6b04bc67970f06c517436eea2b803406915bf8a7 /indra/newview/llnotificationtiphandler.cpp | |
| parent | b84b0e71c12bb5ae7e9a6dafa1735a99f5975645 (diff) | |
| parent | d217adeede2d99ac6f48064388d91aa14ab9a4d2 (diff) | |
Merge
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()) { |