diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2018-08-14 14:05:55 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2018-08-14 14:05:55 +0300 |
| commit | 39202604583e4ce446cf8af4b6b7d152580031d1 (patch) | |
| tree | 5c3bcadac4abb3c243a09db35af3a11dd85775a6 /indra | |
| parent | 6bdbab2fd61cbb3519b40057c2640e942d1e6eb8 (diff) | |
MAINT-8930 FIXED Using "Reset all to recommended settings" still shows the last active preset as "Preset in use" in the UI
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
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<LLFloaterPreference>("preferences"); + if (instance) + { + //don't restore previous preset after closing Preferences + instance->saveGraphicsPreset(std::string()); + } + } LLPanelPreference::saveSettings(); } void LLPanelPreferenceGraphics::setHardwareDefaults() |