diff options
| author | Jonathan Yap <jhwelch@gmail.com> | 2015-02-22 10:19:41 -0500 |
|---|---|---|
| committer | Jonathan Yap <jhwelch@gmail.com> | 2015-02-22 10:19:41 -0500 |
| commit | 1b7c00b558c55dd2c7a8edd8a82632dcb1219fce (patch) | |
| tree | 7a58a81af100c81275c58564973530ab00334eeb /indra/newview/llfloaterloadprefpreset.cpp | |
| parent | 986ddaf9e8770f31461a9240cce5a720cd20bc66 (diff) | |
STORM-2082 Rearrange Reset, load, save, delete buttons.
Make load, save, and delete floaters close when preferences floater closes.
Diffstat (limited to 'indra/newview/llfloaterloadprefpreset.cpp')
| -rw-r--r-- | indra/newview/llfloaterloadprefpreset.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfloaterloadprefpreset.cpp b/indra/newview/llfloaterloadprefpreset.cpp index d831da43f5..403db35cc0 100644 --- a/indra/newview/llfloaterloadprefpreset.cpp +++ b/indra/newview/llfloaterloadprefpreset.cpp @@ -42,7 +42,11 @@ LLFloaterLoadPrefPreset::LLFloaterLoadPrefPreset(const LLSD &key) // virtual BOOL LLFloaterLoadPrefPreset::postBuild() -{ +{ LLFloaterPreference* preferences = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences"); + if (preferences) + { + preferences->addDependentFloater(this); + } getChild<LLButton>("ok")->setCommitCallback(boost::bind(&LLFloaterLoadPrefPreset::onBtnOk, this)); getChild<LLButton>("cancel")->setCommitCallback(boost::bind(&LLFloaterLoadPrefPreset::onBtnCancel, this)); LLPresetsManager::instance().setPresetListChangeCallback(boost::bind(&LLFloaterLoadPrefPreset::onPresetsListChange, this)); |