diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-27 15:17:57 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-28 08:24:59 +0800 |
| commit | 96a81b5ecbe3bffb582ded930752c0523df5e80a (patch) | |
| tree | a87a0bd09fd980562e88150dbfea3819d28d9f12 /indra/newview/llpanelpresetspulldown.cpp | |
| parent | 06e8f0c443c1ba7858d000c6d695b7e988e02053 (diff) | |
| parent | ed73208eb96b862b97fa285036edea1e792ca3c6 (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into 2024.06-atlasaurus
Diffstat (limited to 'indra/newview/llpanelpresetspulldown.cpp')
| -rw-r--r-- | indra/newview/llpanelpresetspulldown.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llpanelpresetspulldown.cpp b/indra/newview/llpanelpresetspulldown.cpp index 61331aad95..3b0f1273df 100644 --- a/indra/newview/llpanelpresetspulldown.cpp +++ b/indra/newview/llpanelpresetspulldown.cpp @@ -57,7 +57,7 @@ LLPanelPresetsPulldown::LLPanelPresetsPulldown() buildFromFile( "panel_presets_pulldown.xml"); } -BOOL LLPanelPresetsPulldown::postBuild() +bool LLPanelPresetsPulldown::postBuild() { LLPresetsManager* presetsMgr = LLPresetsManager::getInstance(); presetsMgr->setPresetListChangeCallback(boost::bind(&LLPanelPresetsPulldown::populatePanel, this)); @@ -125,9 +125,9 @@ void LLPanelPresetsPulldown::onRowClick(const LLSD& user_data) LLPresetsManager::getInstance()->loadPreset(PRESETS_GRAPHIC, name); // Scroll grabbed focus, drop it to prevent selection of parent menu - setFocus(FALSE); + setFocus(false); - setVisible(FALSE); + setVisible(false); } else { @@ -143,7 +143,7 @@ void LLPanelPresetsPulldown::onRowClick(const LLSD& user_data) void LLPanelPresetsPulldown::onGraphicsButtonClick(const LLSD& user_data) { // close the minicontrol, we're bringing up the big one - setVisible(FALSE); + setVisible(false); // bring up the prefs floater LLFloater* prefsfloater = LLFloaterReg::showInstance("preferences"); @@ -162,7 +162,7 @@ void LLPanelPresetsPulldown::onGraphicsButtonClick(const LLSD& user_data) void LLPanelPresetsPulldown::onAutofpsButtonClick(const LLSD& user_data) { - setVisible(FALSE); + setVisible(false); LLFloaterPerformance* performance_floater = LLFloaterReg::showTypedInstance<LLFloaterPerformance>("performance"); if (performance_floater) { |