From a5261a5fa8fad810ecb5c260d92c3e771822bf58 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 20 Feb 2024 23:46:23 +0100 Subject: Convert BOOL to bool in llui --- indra/newview/llfloaterbeacons.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloaterbeacons.cpp') diff --git a/indra/newview/llfloaterbeacons.cpp b/indra/newview/llfloaterbeacons.cpp index cf38a00499..b88ac72dd5 100644 --- a/indra/newview/llfloaterbeacons.cpp +++ b/indra/newview/llfloaterbeacons.cpp @@ -52,9 +52,9 @@ LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed) mCommitCallbackRegistrar.add("Beacons.UICheck", boost::bind(&LLFloaterBeacons::onClickUICheck, this,_1)); } -BOOL LLFloaterBeacons::postBuild() +bool LLFloaterBeacons::postBuild() { - return TRUE; + return true; } // Callback attached to each check box control to both affect their main purpose -- cgit v1.2.3 From 60d3dd98a44230c21803c1606552ee098ed9fa7c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 21 Feb 2024 21:05:14 +0100 Subject: Convert remaining BOOL to bool --- indra/newview/llfloaterbeacons.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'indra/newview/llfloaterbeacons.cpp') diff --git a/indra/newview/llfloaterbeacons.cpp b/indra/newview/llfloaterbeacons.cpp index b88ac72dd5..de3648908f 100644 --- a/indra/newview/llfloaterbeacons.cpp +++ b/indra/newview/llfloaterbeacons.cpp @@ -73,10 +73,10 @@ void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl) LLPipeline::getRenderScriptedBeacons() ) { LLPipeline::setRenderScriptedBeacons(false); - getChild("scripted")->setControlValue(LLSD(FALSE)); - getChild("scripted")->setValue(FALSE); - getChild("touch_only")->setControlValue(LLSD(TRUE)); // just to be sure it's in sync with llpipeline - getChild("touch_only")->setValue(TRUE); + getChild("scripted")->setControlValue(LLSD(false)); + getChild("scripted")->setValue(false); + getChild("touch_only")->setControlValue(LLSD(true)); // just to be sure it's in sync with llpipeline + getChild("touch_only")->setValue(true); } } else if(name == "scripted") @@ -88,10 +88,10 @@ void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl) LLPipeline::getRenderScriptedBeacons() ) { LLPipeline::setRenderScriptedTouchBeacons(false); - getChild("touch_only")->setControlValue(LLSD(FALSE)); - getChild("touch_only")->setValue(FALSE); - getChild("scripted")->setControlValue(LLSD(TRUE)); // just to be sure it's in sync with llpipeline - getChild("scripted")->setValue(TRUE); + getChild("touch_only")->setControlValue(LLSD(false)); + getChild("touch_only")->setValue(false); + getChild("scripted")->setControlValue(LLSD(true)); // just to be sure it's in sync with llpipeline + getChild("scripted")->setValue(true); } } else if(name == "physical") LLPipeline::setRenderPhysicalBeacons(check->get()); @@ -107,10 +107,10 @@ void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl) !LLPipeline::getRenderHighlights() ) { LLPipeline::setRenderBeacons(true); - getChild("beacons")->setControlValue(LLSD(TRUE)); - getChild("beacons")->setValue(TRUE); - getChild("highlights")->setControlValue(LLSD(FALSE)); // just to be sure it's in sync with llpipeline - getChild("highlights")->setValue(FALSE); + getChild("beacons")->setControlValue(LLSD(true)); + getChild("beacons")->setValue(true); + getChild("highlights")->setControlValue(LLSD(false)); // just to be sure it's in sync with llpipeline + getChild("highlights")->setValue(false); } } else if(name == "beacons") @@ -122,10 +122,10 @@ void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl) !LLPipeline::getRenderHighlights() ) { LLPipeline::setRenderHighlights(true); - getChild("highlights")->setControlValue(LLSD(TRUE)); - getChild("highlights")->setValue(TRUE); - getChild("beacons")->setControlValue(LLSD(FALSE)); // just to be sure it's in sync with llpipeline - getChild("beacons")->setValue(FALSE); + getChild("highlights")->setControlValue(LLSD(true)); + getChild("highlights")->setValue(true); + getChild("beacons")->setControlValue(LLSD(false)); // just to be sure it's in sync with llpipeline + getChild("beacons")->setValue(false); } } } -- cgit v1.2.3 From e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 May 2024 21:25:21 +0200 Subject: Fix line endlings --- indra/newview/llfloaterbeacons.cpp | 262 ++++++++++++++++++------------------- 1 file changed, 131 insertions(+), 131 deletions(-) (limited to 'indra/newview/llfloaterbeacons.cpp') diff --git a/indra/newview/llfloaterbeacons.cpp b/indra/newview/llfloaterbeacons.cpp index d597a0cde4..11c1c2a9f2 100644 --- a/indra/newview/llfloaterbeacons.cpp +++ b/indra/newview/llfloaterbeacons.cpp @@ -1,131 +1,131 @@ -/** - * @file llfloaterbeacons.cpp - * @brief Front-end to LLPipeline controls for highlighting various kinds of objects. - * @author Coco - * - * $LicenseInfo:firstyear=2001&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$ - */ - -#include "llviewerprecompiledheaders.h" -#include "llfloaterbeacons.h" -#include "llviewercontrol.h" -#include "lluictrlfactory.h" -#include "llcheckboxctrl.h" -#include "pipeline.h" - - -LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed) -: LLFloater(seed) -{ - // Initialize pipeline states from saved settings. - // OK to do at floater constructor time because beacons do not display unless the floater is open - // therefore it is OK to not initialize the pipeline state before needed. - // Note also that we should replace those pipeline statics with direct lookup of the saved settings - // eliminating the need to keep these states in sync. - LLPipeline::setRenderScriptedTouchBeacons(gSavedSettings.getBOOL("scripttouchbeacon")); - LLPipeline::setRenderScriptedBeacons( gSavedSettings.getBOOL("scriptsbeacon")); - LLPipeline::setRenderPhysicalBeacons( gSavedSettings.getBOOL("physicalbeacon")); - LLPipeline::setRenderSoundBeacons( gSavedSettings.getBOOL("soundsbeacon")); - LLPipeline::setRenderParticleBeacons( gSavedSettings.getBOOL("particlesbeacon")); - LLPipeline::setRenderHighlights( gSavedSettings.getBOOL("renderhighlights")); - LLPipeline::setRenderBeacons( gSavedSettings.getBOOL("renderbeacons")); - LLPipeline::setRenderMOAPBeacons( gSavedSettings.getBOOL("moapbeacon")); - mCommitCallbackRegistrar.add("Beacons.UICheck", boost::bind(&LLFloaterBeacons::onClickUICheck, this,_1)); -} - -bool LLFloaterBeacons::postBuild() -{ - return true; -} - -// Callback attached to each check box control to both affect their main purpose -// and to implement the couple screwy interdependency rules that some have. - -void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl) -{ - LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl; - std::string name = check->getName(); - if(name == "touch_only") - { - LLPipeline::toggleRenderScriptedTouchBeacons(); - // Don't allow both to be ON at the same time. Toggle the other one off if both now on. - if ( - LLPipeline::getRenderScriptedTouchBeacons() && - LLPipeline::getRenderScriptedBeacons() ) - { - LLPipeline::setRenderScriptedBeacons(false); - getChild("scripted")->setControlValue(LLSD(false)); - getChild("scripted")->setValue(false); - getChild("touch_only")->setControlValue(LLSD(true)); // just to be sure it's in sync with llpipeline - getChild("touch_only")->setValue(true); - } - } - else if(name == "scripted") - { - LLPipeline::toggleRenderScriptedBeacons(); - // Don't allow both to be ON at the same time. Toggle the other one off if both now on. - if ( - LLPipeline::getRenderScriptedTouchBeacons() && - LLPipeline::getRenderScriptedBeacons() ) - { - LLPipeline::setRenderScriptedTouchBeacons(false); - getChild("touch_only")->setControlValue(LLSD(false)); - getChild("touch_only")->setValue(false); - getChild("scripted")->setControlValue(LLSD(true)); // just to be sure it's in sync with llpipeline - getChild("scripted")->setValue(true); - } - } - else if(name == "physical") LLPipeline::setRenderPhysicalBeacons(check->get()); - else if(name == "sounds") LLPipeline::setRenderSoundBeacons(check->get()); - else if(name == "particles") LLPipeline::setRenderParticleBeacons(check->get()); - else if(name == "moapbeacon") LLPipeline::setRenderMOAPBeacons(check->get()); - else if(name == "highlights") - { - LLPipeline::toggleRenderHighlights(); - // Don't allow both to be OFF at the same time. Toggle the other one on if both now off. - if ( - !LLPipeline::getRenderBeacons() && - !LLPipeline::getRenderHighlights() ) - { - LLPipeline::setRenderBeacons(true); - getChild("beacons")->setControlValue(LLSD(true)); - getChild("beacons")->setValue(true); - getChild("highlights")->setControlValue(LLSD(false)); // just to be sure it's in sync with llpipeline - getChild("highlights")->setValue(false); - } - } - else if(name == "beacons") - { - LLPipeline::toggleRenderBeacons(); - // Don't allow both to be OFF at the same time. Toggle the other one on if both now off. - if ( - !LLPipeline::getRenderBeacons() && - !LLPipeline::getRenderHighlights() ) - { - LLPipeline::setRenderHighlights(true); - getChild("highlights")->setControlValue(LLSD(true)); - getChild("highlights")->setValue(true); - getChild("beacons")->setControlValue(LLSD(false)); // just to be sure it's in sync with llpipeline - getChild("beacons")->setValue(false); - } - } -} +/** + * @file llfloaterbeacons.cpp + * @brief Front-end to LLPipeline controls for highlighting various kinds of objects. + * @author Coco + * + * $LicenseInfo:firstyear=2001&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$ + */ + +#include "llviewerprecompiledheaders.h" +#include "llfloaterbeacons.h" +#include "llviewercontrol.h" +#include "lluictrlfactory.h" +#include "llcheckboxctrl.h" +#include "pipeline.h" + + +LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed) +: LLFloater(seed) +{ + // Initialize pipeline states from saved settings. + // OK to do at floater constructor time because beacons do not display unless the floater is open + // therefore it is OK to not initialize the pipeline state before needed. + // Note also that we should replace those pipeline statics with direct lookup of the saved settings + // eliminating the need to keep these states in sync. + LLPipeline::setRenderScriptedTouchBeacons(gSavedSettings.getBOOL("scripttouchbeacon")); + LLPipeline::setRenderScriptedBeacons( gSavedSettings.getBOOL("scriptsbeacon")); + LLPipeline::setRenderPhysicalBeacons( gSavedSettings.getBOOL("physicalbeacon")); + LLPipeline::setRenderSoundBeacons( gSavedSettings.getBOOL("soundsbeacon")); + LLPipeline::setRenderParticleBeacons( gSavedSettings.getBOOL("particlesbeacon")); + LLPipeline::setRenderHighlights( gSavedSettings.getBOOL("renderhighlights")); + LLPipeline::setRenderBeacons( gSavedSettings.getBOOL("renderbeacons")); + LLPipeline::setRenderMOAPBeacons( gSavedSettings.getBOOL("moapbeacon")); + mCommitCallbackRegistrar.add("Beacons.UICheck", boost::bind(&LLFloaterBeacons::onClickUICheck, this,_1)); +} + +bool LLFloaterBeacons::postBuild() +{ + return true; +} + +// Callback attached to each check box control to both affect their main purpose +// and to implement the couple screwy interdependency rules that some have. + +void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl) +{ + LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl; + std::string name = check->getName(); + if(name == "touch_only") + { + LLPipeline::toggleRenderScriptedTouchBeacons(); + // Don't allow both to be ON at the same time. Toggle the other one off if both now on. + if ( + LLPipeline::getRenderScriptedTouchBeacons() && + LLPipeline::getRenderScriptedBeacons() ) + { + LLPipeline::setRenderScriptedBeacons(false); + getChild("scripted")->setControlValue(LLSD(false)); + getChild("scripted")->setValue(false); + getChild("touch_only")->setControlValue(LLSD(true)); // just to be sure it's in sync with llpipeline + getChild("touch_only")->setValue(true); + } + } + else if(name == "scripted") + { + LLPipeline::toggleRenderScriptedBeacons(); + // Don't allow both to be ON at the same time. Toggle the other one off if both now on. + if ( + LLPipeline::getRenderScriptedTouchBeacons() && + LLPipeline::getRenderScriptedBeacons() ) + { + LLPipeline::setRenderScriptedTouchBeacons(false); + getChild("touch_only")->setControlValue(LLSD(false)); + getChild("touch_only")->setValue(false); + getChild("scripted")->setControlValue(LLSD(true)); // just to be sure it's in sync with llpipeline + getChild("scripted")->setValue(true); + } + } + else if(name == "physical") LLPipeline::setRenderPhysicalBeacons(check->get()); + else if(name == "sounds") LLPipeline::setRenderSoundBeacons(check->get()); + else if(name == "particles") LLPipeline::setRenderParticleBeacons(check->get()); + else if(name == "moapbeacon") LLPipeline::setRenderMOAPBeacons(check->get()); + else if(name == "highlights") + { + LLPipeline::toggleRenderHighlights(); + // Don't allow both to be OFF at the same time. Toggle the other one on if both now off. + if ( + !LLPipeline::getRenderBeacons() && + !LLPipeline::getRenderHighlights() ) + { + LLPipeline::setRenderBeacons(true); + getChild("beacons")->setControlValue(LLSD(true)); + getChild("beacons")->setValue(true); + getChild("highlights")->setControlValue(LLSD(false)); // just to be sure it's in sync with llpipeline + getChild("highlights")->setValue(false); + } + } + else if(name == "beacons") + { + LLPipeline::toggleRenderBeacons(); + // Don't allow both to be OFF at the same time. Toggle the other one on if both now off. + if ( + !LLPipeline::getRenderBeacons() && + !LLPipeline::getRenderHighlights() ) + { + LLPipeline::setRenderHighlights(true); + getChild("highlights")->setControlValue(LLSD(true)); + getChild("highlights")->setValue(true); + getChild("beacons")->setControlValue(LLSD(false)); // just to be sure it's in sync with llpipeline + getChild("beacons")->setValue(false); + } + } +} -- cgit v1.2.3