diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2020-01-16 13:48:45 +0200 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2020-01-16 13:48:45 +0200 |
| commit | dcbbe66e0a9fcf3d887b043f6e325c86d51a8f4b (patch) | |
| tree | 15363627977a3bf2fb3889c4001f231203dfe123 /indra/newview/llfloaterloadprefpreset.cpp | |
| parent | feb4280e290d3bad8556a7d5073aec0b838e41e6 (diff) | |
SL-12566 Select current preset in 'Select preset' combo when opening the floater
Diffstat (limited to 'indra/newview/llfloaterloadprefpreset.cpp')
| -rw-r--r-- | indra/newview/llfloaterloadprefpreset.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llfloaterloadprefpreset.cpp b/indra/newview/llfloaterloadprefpreset.cpp index 403db35cc0..36fae0391c 100644 --- a/indra/newview/llfloaterloadprefpreset.cpp +++ b/indra/newview/llfloaterloadprefpreset.cpp @@ -65,6 +65,11 @@ void LLFloaterLoadPrefPreset::onOpen(const LLSD& key) EDefaultOptions option = DEFAULT_TOP; LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option); + std::string preset_graphic_active = gSavedSettings.getString("PresetGraphicActive"); + if (!preset_graphic_active.empty()) + { + combo->setSimple(preset_graphic_active); + } } void LLFloaterLoadPrefPreset::onPresetsListChange() @@ -73,6 +78,11 @@ void LLFloaterLoadPrefPreset::onPresetsListChange() EDefaultOptions option = DEFAULT_TOP; LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, combo, option); + std::string preset_graphic_active = gSavedSettings.getString("PresetGraphicActive"); + if (!preset_graphic_active.empty()) + { + combo->setSimple(preset_graphic_active); + } } void LLFloaterLoadPrefPreset::onBtnCancel() |