summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatersaveprefpreset.cpp
diff options
context:
space:
mode:
authorJonathan Yap <jhwelch@gmail.com>2014-12-01 15:36:59 -0500
committerJonathan Yap <jhwelch@gmail.com>2014-12-01 15:36:59 -0500
commit7360f046634d013fec1e9b37c60840a83b470ce1 (patch)
treed41efe489e36c05d3c3f02d9904ed79a3ff4dc4d /indra/newview/llfloatersaveprefpreset.cpp
parent3e9c3b36960fd17cba9114bc2e4564208346b92e (diff)
STORM-2082 Better control on how (or if) to display Default preset
Make sure default preset is created when flyout panel is activated Only display deleted notification upon successful deletion
Diffstat (limited to 'indra/newview/llfloatersaveprefpreset.cpp')
-rw-r--r--indra/newview/llfloatersaveprefpreset.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfloatersaveprefpreset.cpp b/indra/newview/llfloatersaveprefpreset.cpp
index 16d77c0750..3148978778 100644
--- a/indra/newview/llfloatersaveprefpreset.cpp
+++ b/indra/newview/llfloatersaveprefpreset.cpp
@@ -70,7 +70,8 @@ void LLFloaterSavePrefPreset::onOpen(const LLSD& key)
setTitle(floater_title);
- LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, mPresetCombo);
+ EDefaultOptions option = DEFAULT_POSITION_TOP;
+ LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, mPresetCombo, option);
onPresetNameEdited();
}
@@ -88,7 +89,8 @@ void LLFloaterSavePrefPreset::onBtnSave()
void LLFloaterSavePrefPreset::onPresetsListChange()
{
- LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, mPresetCombo);
+ EDefaultOptions option = DEFAULT_POSITION_TOP;
+ LLPresetsManager::getInstance()->setPresetNamesInComboBox(mSubdirectory, mPresetCombo, option);
}
void LLFloaterSavePrefPreset::onBtnCancel()