summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterdeleteprefpreset.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-03-12 08:56:26 -0700
committerGraham Linden <graham@lindenlab.com>2019-03-12 08:56:26 -0700
commitac2fc3029f3b9b6ba182949c29a7919f2f87eb02 (patch)
treec5ed54db8fc7400e4acebed1d3f069092123bbd4 /indra/newview/llfloaterdeleteprefpreset.cpp
parent3e560022459bf3534b873a7f6499dfb5eb75a7d9 (diff)
Backout tabs v spaces changes.
'warn-on-failure:no-tabs'
Diffstat (limited to 'indra/newview/llfloaterdeleteprefpreset.cpp')
-rw-r--r--indra/newview/llfloaterdeleteprefpreset.cpp66
1 files changed, 33 insertions, 33 deletions
diff --git a/indra/newview/llfloaterdeleteprefpreset.cpp b/indra/newview/llfloaterdeleteprefpreset.cpp
index dd8117f95f..bd62849b42 100644
--- a/indra/newview/llfloaterdeleteprefpreset.cpp
+++ b/indra/newview/llfloaterdeleteprefpreset.cpp
@@ -37,65 +37,65 @@
#include "llfloaterreg.h"
LLFloaterDeletePrefPreset::LLFloaterDeletePrefPreset(const LLSD &key)
-: LLFloater(key)
+: LLFloater(key)
{
}
// virtual
BOOL LLFloaterDeletePrefPreset::postBuild()
{
- LLFloaterPreference* preferences = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences");
- if (preferences)
- {
- preferences->addDependentFloater(this);
- }
- getChild<LLButton>("delete")->setCommitCallback(boost::bind(&LLFloaterDeletePrefPreset::onBtnDelete, this));
- getChild<LLButton>("cancel")->setCommitCallback(boost::bind(&LLFloaterDeletePrefPreset::onBtnCancel, this));
- LLPresetsManager::instance().setPresetListChangeCallback(boost::bind(&LLFloaterDeletePrefPreset::onPresetsListChange, this));
-
- return TRUE;
+ LLFloaterPreference* preferences = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences");
+ if (preferences)
+ {
+ preferences->addDependentFloater(this);
+ }
+ getChild<LLButton>("delete")->setCommitCallback(boost::bind(&LLFloaterDeletePrefPreset::onBtnDelete, this));
+ getChild<LLButton>("cancel")->setCommitCallback(boost::bind(&LLFloaterDeletePrefPreset::onBtnCancel, this));
+ LLPresetsManager::instance().setPresetListChangeCallback(boost::bind(&LLFloaterDeletePrefPreset::onPresetsListChange, this));
+
+ return TRUE;
}
void LLFloaterDeletePrefPreset::onOpen(const LLSD& key)
{
- mSubdirectory = key.asString();
- std::string floater_title = getString(std::string("title_") + mSubdirectory);
- setTitle(floater_title);
+ mSubdirectory = key.asString();
+ std::string floater_title = getString(std::string("title_") + mSubdirectory);
+ setTitle(floater_title);
- LLComboBox* combo = getChild<LLComboBox>("preset_combo");
- EDefaultOptions option = DEFAULT_HIDE;
- bool action;
- action = LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);
+ LLComboBox* combo = getChild<LLComboBox>("preset_combo");
+ EDefaultOptions option = DEFAULT_HIDE;
+ bool action;
+ action = LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);
- LLButton* delete_btn = getChild<LLButton>("delete");
- delete_btn->setEnabled(action);
+ LLButton* delete_btn = getChild<LLButton>("delete");
+ delete_btn->setEnabled(action);
}
void LLFloaterDeletePrefPreset::onBtnDelete()
{
- LLComboBox* combo = getChild<LLComboBox>("preset_combo");
- std::string name = combo->getSimple();
+ LLComboBox* combo = getChild<LLComboBox>("preset_combo");
+ std::string name = combo->getSimple();
- if (!LLPresetsManager::getInstance()->deletePreset(mSubdirectory, name))
- {
- LLSD args;
- args["NAME"] = name;
- LLNotificationsUtil::add("PresetNotDeleted", args);
- }
+ if (!LLPresetsManager::getInstance()->deletePreset(mSubdirectory, name))
+ {
+ LLSD args;
+ args["NAME"] = name;
+ LLNotificationsUtil::add("PresetNotDeleted", args);
+ }
- closeFloater();
+ closeFloater();
}
void LLFloaterDeletePrefPreset::onPresetsListChange()
{
- LLComboBox* combo = getChild<LLComboBox>("preset_combo");
+ LLComboBox* combo = getChild<LLComboBox>("preset_combo");
- EDefaultOptions option = DEFAULT_HIDE;
+ EDefaultOptions option = DEFAULT_HIDE;
- LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);
+ LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option);
}
void LLFloaterDeletePrefPreset::onBtnCancel()
{
- closeFloater();
+ closeFloater();
}