summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
diff options
context:
space:
mode:
authorJonathan Yap <jhwelch@gmail.com>2014-12-09 16:48:00 -0500
committerJonathan Yap <jhwelch@gmail.com>2014-12-09 16:48:00 -0500
commit47282ceb7e8b8083cf816dd26bd4907aba313959 (patch)
tree9a74d988f638915049dd3b20593c2eb39c631db4 /indra/newview/llfloaterpreference.cpp
parent5be238b127ff30f09105ad6f0d9b8ee3dec8b40f (diff)
STORM-2082 Improve file error handling, add help topic labels to new floaters.
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rwxr-xr-xindra/newview/llfloaterpreference.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 7b252ebd4f..e0c579f783 100755
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -879,6 +879,9 @@ void LLFloaterPreference::onBtnOK()
if (LLStartUp::getStartupState() == STATE_STARTED)
{
+ // Write settings to currently defined preset. This will recreate a missing preset file
+ // and ensure the preset file matches the current settings (which may have been changed
+ // via some other means).
LLPresetsManager::getInstance()->savePreset(PRESETS_GRAPHIC, gSavedSettings.getString("PresetGraphicActive"));
}
}