diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-03-25 20:15:51 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-03-25 20:15:51 -0400 |
commit | 0a56031bd3e3645a9e5124a722cece0706469944 (patch) | |
tree | 39e2244564d2b71d8277231f691160807f8c10b9 /indra/newview/llnotificationtiphandler.cpp | |
parent | 885fc3f9b54cca33e134bcfb65c1d2a9c0aeec7a (diff) | |
parent | fad31dc087cb670bd4479195cac2c31da9a55e57 (diff) |
automated 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()) { |