diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-05-23 11:31:19 -0700 | 
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-05-23 11:31:19 -0700 | 
| commit | a1f49564d670a2c41bfa25c833bba2564b9b7f48 (patch) | |
| tree | 1d205e51bc37621916a17d459ad83782fe41f975 /indra/newview/llfloateraddpaymentmethod.cpp | |
| parent | 6af5db09faf5ea33a2d4c47b64e76f42edae178a (diff) | |
| parent | 6377610f6587989c126b00f490dfc8d527a1c2ce (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
Diffstat (limited to 'indra/newview/llfloateraddpaymentmethod.cpp')
| -rw-r--r-- | indra/newview/llfloateraddpaymentmethod.cpp | 48 | 
1 files changed, 24 insertions, 24 deletions
diff --git a/indra/newview/llfloateraddpaymentmethod.cpp b/indra/newview/llfloateraddpaymentmethod.cpp index cd265707a5..fc962ce89f 100644 --- a/indra/newview/llfloateraddpaymentmethod.cpp +++ b/indra/newview/llfloateraddpaymentmethod.cpp @@ -1,25 +1,25 @@ -/**  +/**   * @file llfloateraddpaymentmethod.cpp   * @brief LLFloaterAddPaymentMethod class implementation   *   * $LicenseInfo:firstyear=2020&license=viewerlgpl$   * Second Life Viewer Source Code   * Copyright (C) 2020, 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$   */ @@ -33,7 +33,7 @@  LLFloaterAddPaymentMethod::LLFloaterAddPaymentMethod(const LLSD& key) -	:	LLFloater(key) +    :   LLFloater(key)  {  } @@ -43,39 +43,39 @@ LLFloaterAddPaymentMethod::~LLFloaterAddPaymentMethod()  bool LLFloaterAddPaymentMethod::postBuild()  { -	setCanDrag(false); -	getChild<LLButton>("continue_btn")->setCommitCallback(boost::bind(&LLFloaterAddPaymentMethod::onContinueBtn, this)); -	getChild<LLButton>("close_btn")->setCommitCallback(boost::bind(&LLFloaterAddPaymentMethod::onCloseBtn, this)); -	return true; +    setCanDrag(false); +    getChild<LLButton>("continue_btn")->setCommitCallback(boost::bind(&LLFloaterAddPaymentMethod::onContinueBtn, this)); +    getChild<LLButton>("close_btn")->setCommitCallback(boost::bind(&LLFloaterAddPaymentMethod::onCloseBtn, this)); +    return true;  }  void LLFloaterAddPaymentMethod::onOpen(const LLSD& key)  { -	centerOnScreen(); +    centerOnScreen();  }  void LLFloaterAddPaymentMethod::onContinueBtn()  { -	closeFloater(); -	LLNotificationsUtil::add("AddPaymentMethod", LLSD(), LLSD(), -		[this](const LLSD¬if, const LLSD&resp) -	{ -		S32 opt = LLNotificationsUtil::getSelectedOption(notif, resp); -		if (opt == 0) -		{ -			LLWeb::loadURL(this->getString("continue_url")); -		} -	});  +    closeFloater(); +    LLNotificationsUtil::add("AddPaymentMethod", LLSD(), LLSD(), +        [this](const LLSD¬if, const LLSD&resp) +    { +        S32 opt = LLNotificationsUtil::getSelectedOption(notif, resp); +        if (opt == 0) +        { +            LLWeb::loadURL(this->getString("continue_url")); +        } +    });  }  void LLFloaterAddPaymentMethod::onCloseBtn()  { -	closeFloater(); +    closeFloater();  }  void LLFloaterAddPaymentMethod::centerOnScreen()  { -	LLVector2 window_size = LLUI::getInstance()->getWindowSize(); -	centerWithin(LLRect(0, 0, ll_round(window_size.mV[VX]), ll_round(window_size.mV[VY]))); +    LLVector2 window_size = LLUI::getInstance()->getWindowSize(); +    centerWithin(LLRect(0, 0, ll_round(window_size.mV[VX]), ll_round(window_size.mV[VY])));  }  | 
