diff options
| author | Dave Parks <davep@lindenlab.com> | 2009-11-24 23:21:57 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2009-11-24 23:21:57 -0600 |
| commit | e264f00c833805e1f813bc1d0b2cfd7a1bf7b272 (patch) | |
| tree | 1a64a520502d2ed2c7dadc2316e543ae9e9a91d2 /indra/newview/llnotificationgrouphandler.cpp | |
| parent | c9e153c182dae9472a2b87cddfec8c47b30b06b9 (diff) | |
| parent | 5b5354c933aa7b1ceeb307853c24fba28d4e31bf (diff) | |
Merge
Diffstat (limited to 'indra/newview/llnotificationgrouphandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationgrouphandler.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/indra/newview/llnotificationgrouphandler.cpp b/indra/newview/llnotificationgrouphandler.cpp index ffa92b543c..b7466ec6d4 100644 --- a/indra/newview/llnotificationgrouphandler.cpp +++ b/indra/newview/llnotificationgrouphandler.cpp @@ -37,6 +37,7 @@ #include "llgroupactions.h" #include "llviewercontrol.h" #include "llviewerwindow.h" +#include "llnotificationmanager.h" using namespace LLNotificationsUI; @@ -47,6 +48,9 @@ LLGroupHandler::LLGroupHandler(e_notification_type type, const LLSD& id) // Getting a Channel for our notifications mChannel = LLChannelManager::getInstance()->createNotificationChannel(); + LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel); + if(channel) + channel->setOnRejectToastCallback(boost::bind(&LLGroupHandler::onRejectToast, this, _1)); } //-------------------------------------------------------------------------- @@ -57,7 +61,7 @@ LLGroupHandler::~LLGroupHandler() //-------------------------------------------------------------------------- void LLGroupHandler::initChannel() { - S32 channel_right_bound = gViewerWindow->getWorldViewRect().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); + S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth"); mChannel->init(channel_right_bound - channel_width, channel_right_bound); } @@ -118,5 +122,15 @@ void LLGroupHandler::onDeleteToast(LLToast* toast) } //-------------------------------------------------------------------------- +void LLGroupHandler::onRejectToast(LLUUID& id) +{ + LLNotificationPtr notification = LLNotifications::instance().find(id); + + if (notification && LLNotificationManager::getInstance()->getHandlerForNotification(notification->getType()) == this) + { + LLNotifications::instance().cancel(notification); + } +} +//-------------------------------------------------------------------------- |