From 83bb4b9518da813a42e49366cea15e5ae9dc7507 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 16 Sep 2010 22:10:30 -0700 Subject: fixed merge --- indra/newview/llnotificationtiphandler.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llnotificationtiphandler.cpp') diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp index 94612975a2..3c1cd107df 100644 --- a/indra/newview/llnotificationtiphandler.cpp +++ b/indra/newview/llnotificationtiphandler.cpp @@ -27,6 +27,8 @@ #include "llviewerprecompiledheaders.h" // must be first include +#include "llchannelmanager.h" +#include "llinstantmessage.h" #include "llfloaterreg.h" #include "llnearbychat.h" #include "llnotificationhandler.h" @@ -36,6 +38,7 @@ #include "llviewerwindow.h" #include "llnotificationmanager.h" #include "llpaneltiptoast.h" +#include "lltoast.h" using namespace LLNotificationsUI; -- cgit v1.2.3 From 949b60465593764118c03d0f4e112f69c41bab31 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 17 Sep 2010 15:01:44 -0700 Subject: Backed out changeset: d71309f8bd0e --- indra/newview/llnotificationtiphandler.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'indra/newview/llnotificationtiphandler.cpp') diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp index 3c1cd107df..94612975a2 100644 --- a/indra/newview/llnotificationtiphandler.cpp +++ b/indra/newview/llnotificationtiphandler.cpp @@ -27,8 +27,6 @@ #include "llviewerprecompiledheaders.h" // must be first include -#include "llchannelmanager.h" -#include "llinstantmessage.h" #include "llfloaterreg.h" #include "llnearbychat.h" #include "llnotificationhandler.h" @@ -38,7 +36,6 @@ #include "llviewerwindow.h" #include "llnotificationmanager.h" #include "llpaneltiptoast.h" -#include "lltoast.h" using namespace LLNotificationsUI; -- cgit v1.2.3 From a748466377982f376d4901e3450e6b927cf96a4d Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Mon, 20 Sep 2010 19:16:17 -0700 Subject: EXP-82 FIX MOTD open in external browser notification not given until fully logged in reviewed by Monroe --- indra/newview/llnotificationtiphandler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llnotificationtiphandler.cpp') diff --git a/indra/newview/llnotificationtiphandler.cpp b/indra/newview/llnotificationtiphandler.cpp index 94612975a2..02b217fc94 100644 --- a/indra/newview/llnotificationtiphandler.cpp +++ b/indra/newview/llnotificationtiphandler.cpp @@ -96,7 +96,7 @@ bool LLTipHandler::processNotification(const LLSD& notify) LLNearbyChat>("nearby_chat", LLSD()); if (nearby_chat->getVisible()) { - return true; + return false; } } @@ -121,7 +121,7 @@ bool LLTipHandler::processNotification(const LLSD& notify) // don't spawn toast for inventory accepted/declined offers if respective IM window is open (EXT-5909) if (!LLHandlerUtil::canSpawnToast(notification)) { - return true; + return false; } LLToastPanel* notify_box = LLToastPanel::buidPanelFromNotification(notification); @@ -144,7 +144,7 @@ bool LLTipHandler::processNotification(const LLSD& notify) { mChannel->killToastByNotificationID(notification->getID()); } - return true; + return false; } //-------------------------------------------------------------------------- -- cgit v1.2.3