diff options
Diffstat (limited to 'indra/newview/llnotificationscripthandler.cpp')
| -rw-r--r-- | indra/newview/llnotificationscripthandler.cpp | 163 | 
1 files changed, 81 insertions, 82 deletions
diff --git a/indra/newview/llnotificationscripthandler.cpp b/indra/newview/llnotificationscripthandler.cpp index bb39d8f362..842c24db8a 100644 --- a/indra/newview/llnotificationscripthandler.cpp +++ b/indra/newview/llnotificationscripthandler.cpp @@ -1,25 +1,25 @@ -/**  +/**   * @file llnotificationscripthandler.cpp   * @brief Notification Handler Class for Simple Notifications and Notification Tips   *   * $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$   */ @@ -42,15 +42,15 @@ using namespace LLNotificationsUI;  //--------------------------------------------------------------------------  LLScriptHandler::LLScriptHandler() -:	LLSystemNotificationHandler("Notifications", "notify") +:   LLSystemNotificationHandler("Notifications", "notify")  { -	// Getting a Channel for our notifications -	LLScreenChannel* channel = LLChannelManager::getInstance()->createNotificationChannel(); -	if(channel) -	{ -		channel->setControlHovering(true); -		mChannel = channel->getHandle(); -	} +    // Getting a Channel for our notifications +    LLScreenChannel* channel = LLChannelManager::getInstance()->createNotificationChannel(); +    if(channel) +    { +        channel->setControlHovering(true); +        mChannel = channel->getHandle(); +    }  }  //-------------------------------------------------------------------------- @@ -61,9 +61,8 @@ LLScriptHandler::~LLScriptHandler()  //--------------------------------------------------------------------------  void LLScriptHandler::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);  }  //-------------------------------------------------------------------------- @@ -72,77 +71,77 @@ void LLScriptHandler::addToastWithNotification(const LLNotificationPtr& notifica      LL_PROFILE_ZONE_SCOPED      LLToastPanel* notify_box = LLToastPanel::buidPanelFromNotification(notification); -	LLToast::Params p; -	p.notif_id = notification->getID(); -	p.notification = notification; -	p.panel = notify_box; -	p.on_delete_toast = boost::bind(&LLScriptHandler::onDeleteToast, this, _1); -	p.can_fade = notification->canFadeToast(); -	if(gAgent.isDoNotDisturb()) -	{  -		p.force_show = notification->getName() == "SystemMessage"  -						||	notification->getName() == "GodMessage"  -						|| notification->getPriority() >= NOTIFICATION_PRIORITY_HIGH; -	} - -	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get()); -	if(channel) -	{ -		channel->addToast(p); -	} +    LLToast::Params p; +    p.notif_id = notification->getID(); +    p.notification = notification; +    p.panel = notify_box; +    p.on_delete_toast = boost::bind(&LLScriptHandler::onDeleteToast, this, _1); +    p.can_fade = notification->canFadeToast(); +    if(gAgent.isDoNotDisturb()) +    { +        p.force_show = notification->getName() == "SystemMessage" +                        ||  notification->getName() == "GodMessage" +                        || notification->getPriority() >= NOTIFICATION_PRIORITY_HIGH; +    } + +    LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get()); +    if(channel) +    { +        channel->addToast(p); +    }  }  //--------------------------------------------------------------------------  bool LLScriptHandler::processNotification(const LLNotificationPtr& notification, bool should_log)  { -	if(mChannel.isDead()) -	{ -		return false; -	} - -	// arrange a channel on a screen -	if(!mChannel.get()->getVisible()) -	{ -		initChannel(); -	} -	 -	if (should_log && notification->canLogToIM()) -	{ -		LLHandlerUtil::logToIMP2P(notification); -	} - -	if(notification->hasFormElements() && !notification->canShowToast()) -	{ -		LLScriptFloaterManager::getInstance()->onAddNotification(notification->getID()); -	} -	else if (notification->canShowToast()) -	{ -		addToastWithNotification(notification); -	} - -	return false; +    if(mChannel.isDead()) +    { +        return false; +    } + +    // arrange a channel on a screen +    if(!mChannel.get()->getVisible()) +    { +        initChannel(); +    } + +    if (should_log && notification->canLogToIM()) +    { +        LLHandlerUtil::logToIMP2P(notification); +    } + +    if(notification->hasFormElements() && !notification->canShowToast()) +    { +        LLScriptFloaterManager::getInstance()->onAddNotification(notification->getID()); +    } +    else if (notification->canShowToast()) +    { +        addToastWithNotification(notification); +    } + +    return false;  }  void LLScriptHandler::onChange( LLNotificationPtr notification )  { -	LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get()); -	if (channel) -	{ -		channel->removeToastByNotificationID(notification->getID()); -		addToastWithNotification(notification); -	} +    LLScreenChannel* channel = dynamic_cast<LLScreenChannel*>(mChannel.get()); +    if (channel) +    { +        channel->removeToastByNotificationID(notification->getID()); +        addToastWithNotification(notification); +    }  }  void LLScriptHandler::onDelete( LLNotificationPtr notification )  { -	if(notification->hasFormElements() && !notification->canShowToast()) -	{ -		LLScriptFloaterManager::getInstance()->onRemoveNotification(notification->getID()); -	} -	else -	{ -		mChannel.get()->removeToastByNotificationID(notification->getID()); -	} +    if(notification->hasFormElements() && !notification->canShowToast()) +    { +        LLScriptFloaterManager::getInstance()->onRemoveNotification(notification->getID()); +    } +    else +    { +        mChannel.get()->removeToastByNotificationID(notification->getID()); +    }  } @@ -150,14 +149,14 @@ void LLScriptHandler::onDelete( LLNotificationPtr notification )  void LLScriptHandler::onDeleteToast(LLToast* toast)  { -	// send a signal to a listener to let him perform some action -	// in this case listener is a SysWellWindow and it will remove a corresponding item from its list -	LLNotificationPtr notification = LLNotifications::getInstance()->find(toast->getNotificationID()); -	 -	if( notification && notification->hasFormElements() && !notification->canShowToast()) -	{ -		LLScriptFloaterManager::getInstance()->onRemoveNotification(notification->getID()); -	} +    // send a signal to a listener to let him perform some action +    // in this case listener is a SysWellWindow and it will remove a corresponding item from its list +    LLNotificationPtr notification = LLNotifications::getInstance()->find(toast->getNotificationID()); + +    if( notification && notification->hasFormElements() && !notification->canShowToast()) +    { +        LLScriptFloaterManager::getInstance()->onRemoveNotification(notification->getID()); +    }  }  | 
