diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-04-07 19:15:40 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-04-07 19:15:40 +0300 |
| commit | 3bac0d4283c8d8a7f067a302c4ec0e533457c899 (patch) | |
| tree | 9d3b53db0b8994dde5a73ec98e80b88cc43a9a84 /indra/newview/llfloatersavecamerapreset.cpp | |
| parent | 1f5bb7be28768fe5341b1ca4b5a5d366f176045e (diff) | |
SL-12991 [Camera Presets] Sort all Camera preset lists in the same way
Diffstat (limited to 'indra/newview/llfloatersavecamerapreset.cpp')
| -rw-r--r-- | indra/newview/llfloatersavecamerapreset.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llfloatersavecamerapreset.cpp b/indra/newview/llfloatersavecamerapreset.cpp index bbc4b5e354..34aefdf1c1 100644 --- a/indra/newview/llfloatersavecamerapreset.cpp +++ b/indra/newview/llfloatersavecamerapreset.cpp @@ -84,7 +84,7 @@ void LLFloaterSaveCameraPreset::onOpen(const LLSD& key) index = key["index"].asInteger(); } - LLPresetsManager::getInstance()->setPresetNamesInComboBox(PRESETS_CAMERA, mPresetCombo, DEFAULT_HIDE); + LLPresetsManager::getInstance()->setPresetNamesInComboBox(PRESETS_CAMERA, mPresetCombo, DEFAULT_BOTTOM); mSaveRadioGroup->setSelectedIndex(index); onPresetNameEdited(); @@ -110,8 +110,7 @@ void LLFloaterSaveCameraPreset::onBtnSave() if (is_saving_new) { std::list<std::string> preset_names; - std::string presets_dir = LLPresetsManager::getInstance()->getPresetsDir(PRESETS_CAMERA); - LLPresetsManager::getInstance()->loadPresetNamesFromDir(presets_dir, preset_names, DEFAULT_HIDE); + LLPresetsManager::getInstance()->loadPresetNamesFromDir(PRESETS_CAMERA, preset_names, DEFAULT_HIDE); if (std::find(preset_names.begin(), preset_names.end(), name) != preset_names.end()) { LLSD args; @@ -133,7 +132,7 @@ void LLFloaterSaveCameraPreset::onBtnSave() void LLFloaterSaveCameraPreset::onPresetsListChange() { - LLPresetsManager::getInstance()->setPresetNamesInComboBox(PRESETS_CAMERA, mPresetCombo, DEFAULT_HIDE); + LLPresetsManager::getInstance()->setPresetNamesInComboBox(PRESETS_CAMERA, mPresetCombo, DEFAULT_BOTTOM); } void LLFloaterSaveCameraPreset::onBtnCancel() |