summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2018-08-15 13:45:47 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2018-08-15 13:45:47 +0300
commit961d7933f5da61f7802d83db1b6c4ed190096c75 (patch)
tree7df7c89e61193a70c80748f84d4d484c303c8bba /indra
parent39202604583e4ce446cf8af4b6b7d152580031d1 (diff)
mac build fix
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llfloaterpreference.cpp5
1 files changed, 3 insertions, 2 deletions
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<LLFloaterPreference>("preferences");
if (instance)
{
//don't restore previous preset after closing Preferences
- instance->saveGraphicsPreset(std::string());
+ instance->saveGraphicsPreset(preset_graphic_active);
}
}
LLPanelPreference::saveSettings();