From 60311c6409b2ec6590b0f08135c7715f982c94ea Mon Sep 17 00:00:00 2001
From: Jonathan Yap <jhwelch@gmail.com>
Date: Wed, 21 Jan 2015 04:57:42 -0500
Subject: [PATCH] STORM-2082 Put "Default" at the top of the non-Delete
comboboxes.
---
indra/newview/llfloatersaveprefpreset.cpp | 4 ++--
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 610c701d8de..686a2f32692 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 e67ebcc0c68..205c5e6dfb3 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
--
GitLab