diff options
Diffstat (limited to 'indra/newview/llnotificationgrouphandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationgrouphandler.cpp | 83 | 
1 files changed, 41 insertions, 42 deletions
diff --git a/indra/newview/llnotificationgrouphandler.cpp b/indra/newview/llnotificationgrouphandler.cpp index f87ebf219b..0aa8b4362f 100644 --- a/indra/newview/llnotificationgrouphandler.cpp +++ b/indra/newview/llnotificationgrouphandler.cpp @@ -1,25 +1,25 @@ -/**  +/**   * @file llnotificationgrouphandler.cpp   * @brief Notification Handler Class for Group Notifications   *   * $LicenseInfo:firstyear=2000&license=viewerlgpl$   * Second Life Viewer Source Code   * Copyright (C) 2010, Linden Research, Inc. - *  + *   * This library is free software; you can redistribute it and/or   * modify it under the terms of the GNU Lesser General Public   * License as published by the Free Software Foundation;   * version 2.1 of the License only. - *  + *   * This library is distributed in the hope that it will be useful,   * but WITHOUT ANY WARRANTY; without even the implied warranty of   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU   * Lesser General Public License for more details. - *  + *   * You should have received a copy of the GNU Lesser General Public   * License along with this library; if not, write to the Free Software   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA - *  + *   * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA   * $/LicenseInfo$   */ @@ -38,14 +38,14 @@ using namespace LLNotificationsUI;  //--------------------------------------------------------------------------  LLGroupHandler::LLGroupHandler() -:	LLCommunicationNotificationHandler("Group Notifications", "groupnotify") +:   LLCommunicationNotificationHandler("Group Notifications", "groupnotify")  { -	// Getting a Channel for our notifications -	LLScreenChannel* channel = LLChannelManager::getInstance()->createNotificationChannel(); -	if(channel) -	{ -		mChannel = channel->getHandle(); -	} +    // Getting a Channel for our notifications +    LLScreenChannel* channel = LLChannelManager::getInstance()->createNotificationChannel(); +    if(channel) +    { +        mChannel = channel->getHandle(); +    }  }  //-------------------------------------------------------------------------- @@ -56,41 +56,40 @@ LLGroupHandler::~LLGroupHandler()  //--------------------------------------------------------------------------  void LLGroupHandler::initChannel()  { -	S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin");  -	S32 channel_width = gSavedSettings.getS32("NotifyBoxWidth"); -	mChannel.get()->init(channel_right_bound - channel_width, channel_right_bound); +    S32 channel_right_bound = gViewerWindow->getWorldViewRectScaled().mRight - gSavedSettings.getS32("NotificationChannelRightMargin"); +    mChannel.get()->init(channel_right_bound - NOTIFY_BOX_WIDTH, channel_right_bound);  }  //--------------------------------------------------------------------------  bool LLGroupHandler::processNotification(const LLNotificationPtr& notification, bool should_log)  { -	if(mChannel.isDead()) -	{ -		return false; -	} - -	// arrange a channel on a screen -	if(!mChannel.get()->getVisible()) -	{ -		initChannel(); -	} -	 -	LLHandlerUtil::logGroupNoticeToIMGroup(notification); - -	LLPanel* notify_box = new LLToastGroupNotifyPanel(notification); -	LLToast::Params p; -	p.notif_id = notification->getID(); -	p.notification = notification; -	p.panel = notify_box; -	p.on_delete_toast = boost::bind(&LLGroupHandler::onDeleteToast, this, _1); - -	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get()); -	if(channel) -		channel->addToast(p); - -	LLGroupActions::refresh_notices(); - -	return false; +    if(mChannel.isDead()) +    { +        return false; +    } + +    // arrange a channel on a screen +    if(!mChannel.get()->getVisible()) +    { +        initChannel(); +    } + +    LLHandlerUtil::logGroupNoticeToIMGroup(notification); + +    LLPanel* notify_box = new LLToastGroupNotifyPanel(notification); +    LLToast::Params p; +    p.notif_id = notification->getID(); +    p.notification = notification; +    p.panel = notify_box; +    p.on_delete_toast = boost::bind(&LLGroupHandler::onDeleteToast, this, _1); + +    LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get()); +    if(channel) +        channel->addToast(p); + +    LLGroupActions::refresh_notices(); + +    return false;  }  | 
