diff options
author | Kent Quirk <q@lindenlab.com> | 2010-03-24 01:26:23 -0400 |
---|---|---|
committer | Kent Quirk <q@lindenlab.com> | 2010-03-24 01:26:23 -0400 |
commit | bd95e64d3da1b90b37e88e31979cc8f227d5cc58 (patch) | |
tree | fff84f4075cb34a3fdd589bf399e47bebb8bc17d /indra/newview/llnotificationtiphandler.cpp | |
parent | 3ad56f22158dd2665204745af2171689f208cd7e (diff) | |
parent | 00a97a4f95f644b1807d72cebce6dd6a7a1cf31e (diff) |
Set hotfix build params for Release.
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()) { |