From 39202604583e4ce446cf8af4b6b7d152580031d1 Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Tue, 14 Aug 2018 14:05:55 +0300 Subject: MAINT-8930 FIXED Using "Reset all to recommended settings" still shows the last active preset as "Preset in use" in the UI --- indra/newview/llfloaterpreference.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/newview/llfloaterpreference.cpp') diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 4ce35643b1..a090fa3f44 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -2704,6 +2704,15 @@ void LLPanelPreferenceGraphics::cancel() void LLPanelPreferenceGraphics::saveSettings() { resetDirtyChilds(); + if (gSavedSettings.getString("PresetGraphicActive").empty()) + { + LLFloaterPreference* instance = LLFloaterReg::findTypedInstance("preferences"); + if (instance) + { + //don't restore previous preset after closing Preferences + instance->saveGraphicsPreset(std::string()); + } + } LLPanelPreference::saveSettings(); } void LLPanelPreferenceGraphics::setHardwareDefaults() -- cgit v1.2.3 From 961d7933f5da61f7802d83db1b6c4ed190096c75 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Wed, 15 Aug 2018 13:45:47 +0300 Subject: mac build fix --- indra/newview/llfloaterpreference.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloaterpreference.cpp') diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index a090fa3f44..7aff9fb586 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -2704,13 +2704,14 @@ void LLPanelPreferenceGraphics::cancel() void LLPanelPreferenceGraphics::saveSettings() { resetDirtyChilds(); - if (gSavedSettings.getString("PresetGraphicActive").empty()) + std::string preset_graphic_active = gSavedSettings.getString("PresetGraphicActive"); + if (preset_graphic_active.empty()) { LLFloaterPreference* instance = LLFloaterReg::findTypedInstance("preferences"); if (instance) { //don't restore previous preset after closing Preferences - instance->saveGraphicsPreset(std::string()); + instance->saveGraphicsPreset(preset_graphic_active); } } LLPanelPreference::saveSettings(); -- cgit v1.2.3