diff options
| author | Jonathan Yap <jhwelch@gmail.com> | 2015-01-21 04:57:42 -0500 |
|---|---|---|
| committer | Jonathan Yap <jhwelch@gmail.com> | 2015-01-21 04:57:42 -0500 |
| commit | 60311c6409b2ec6590b0f08135c7715f982c94ea (patch) | |
| tree | 995ada8bd34b9895dfbb65599c82958ec9a3e8bf | |
| parent | 58577702a8c185683e089afc3f7fbcbaaf40122c (diff) | |
STORM-2082 Put "Default" at the top of the non-Delete comboboxes.
| -rw-r--r-- | indra/newview/llfloatersaveprefpreset.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llpresetsmanager.cpp | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/indra/newview/llfloatersaveprefpreset.cpp b/indra/newview/llfloatersaveprefpreset.cpp index 610c701d8d..686a2f3269 100644 --- a/indra/newview/llfloatersaveprefpreset.cpp +++ b/indra/newview/llfloatersaveprefpreset.cpp @@ -70,7 +70,7 @@ void LLFloaterSavePrefPreset::onOpen(const LLSD& key) setTitle(floater_title); - EDefaultOptions option = DEFAULT_SHOW; + EDefaultOptions option = DEFAULT_TOP; LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, mPresetCombo, option); onPresetNameEdited(); @@ -92,7 +92,7 @@ void LLFloaterSavePrefPreset::onBtnSave() void LLFloaterSavePrefPreset::onPresetsListChange() { - EDefaultOptions option = DEFAULT_SHOW; + EDefaultOptions option = DEFAULT_TOP; LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, mPresetCombo, option); } diff --git a/indra/newview/llpresetsmanager.cpp b/indra/newview/llpresetsmanager.cpp index e67ebcc0c6..205c5e6dfb 100644 --- a/indra/newview/llpresetsmanager.cpp +++ b/indra/newview/llpresetsmanager.cpp @@ -214,14 +214,7 @@ void LLPresetsManager::setPresetNamesInComboBox(const std::string& subdirectory, for (std::list<std::string>::const_iterator it = preset_names.begin(); it != preset_names.end(); ++it) { const std::string& name = *it; - if (name != preset_graphic_active) - { - combo->add(name, LLSD().with(0, name)); - } - else - { - combo->add(name, LLSD().with(0, name), ADD_TOP); - } + combo->add(name, LLSD().with(0, name)); } } else |