summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterdeleteprefpreset.cpp
diff options
context:
space:
mode:
authorJonathan Yap <jhwelch@gmail.com>2015-01-20 09:17:23 -0500
committerJonathan Yap <jhwelch@gmail.com>2015-01-20 09:17:23 -0500
commit611391a818746f560ad49847ae643613313ac216 (patch)
tree58ffb1435038521d66d96ba321773c583cf1b25f /indra/newview/llfloaterdeleteprefpreset.cpp
parentce324355787bd9c1c864050ca54b4306c30a0e79 (diff)
STORM-2082 Update to new UI design. Bugs are not worked out yet.
Diffstat (limited to 'indra/newview/llfloaterdeleteprefpreset.cpp')
-rw-r--r--indra/newview/llfloaterdeleteprefpreset.cpp12
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/newview/llfloaterdeleteprefpreset.cpp b/indra/newview/llfloaterdeleteprefpreset.cpp
index f147a5ee90..5cd37d61fc 100644
--- a/indra/newview/llfloaterdeleteprefpreset.cpp
+++ b/indra/newview/llfloaterdeleteprefpreset.cpp
@@ -1,5 +1,5 @@
/**
- * @file llfloaterdeletprefpreset.cpp
+ * @file llfloaterdeleteprefpreset.cpp
* @brief Floater to delete a graphics / camera preset
*
* $LicenseInfo:firstyear=2014&license=viewerlgpl$
@@ -67,15 +67,7 @@ void LLFloaterDeletePrefPreset::onBtnDelete()
LLComboBox* combo = getChild<LLComboBox>("preset_combo");
std::string name = combo->getSimple();
- if (LLPresetsManager::getInstance()->deletePreset(mSubdirectory, name))
- {
- // If you delete the active preset (which should never happen) then recreate it.
- if (name == gSavedSettings.getString("PresetGraphicActive"))
- {
- LLPresetsManager::getInstance()->savePreset(mSubdirectory, PRESETS_DEFAULT);
- }
- }
- else
+ if (!LLPresetsManager::getInstance()->deletePreset(mSubdirectory, name))
{
LLSD args;
args["NAME"] = name;