diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-11-04 11:53:49 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-11-04 11:53:49 -0500 |
| commit | 8188a8c410807debd2d7d40d0299c36b92e56ca3 (patch) | |
| tree | 68a586a4f32bfd1f395c4942701813e002047622 /indra/newview/llnotificationscripthandler.cpp | |
| parent | 2dbf6569a77c37d7c7ecc684dd417ddbbb7c6bab (diff) | |
| parent | 6ed4c84a30e8f4044ccaedba114e13e07ae5c46d (diff) | |
merge
Diffstat (limited to 'indra/newview/llnotificationscripthandler.cpp')
| -rwxr-xr-x | indra/newview/llnotificationscripthandler.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llnotificationscripthandler.cpp b/indra/newview/llnotificationscripthandler.cpp index 08c98e4f28..a3b15931c6 100755 --- a/indra/newview/llnotificationscripthandler.cpp +++ b/indra/newview/llnotificationscripthandler.cpp @@ -35,6 +35,9 @@ #include "llnotificationmanager.h" #include "llnotifications.h" #include "llscriptfloater.h" +#include "llfacebookconnect.h" +#include "llavatarname.h" +#include "llavatarnamecache.h" using namespace LLNotificationsUI; @@ -87,7 +90,7 @@ bool LLScriptHandler::processNotification(const LLNotificationPtr& notification) { LLScriptFloaterManager::getInstance()->onAddNotification(notification->getID()); } - else + else if (notification->canShowToast()) { LLToastPanel* notify_box = LLToastPanel::buidPanelFromNotification(notification); |