summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-03-20 21:41:26 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-03-20 21:41:26 +0000
commite3b97ac65b10a58c1dac041743e4acd1042492f5 (patch)
tree1648189fd15e51ac1c2eb8d8018faa775c93f6d3 /indra/newview/llfloaterpreference.cpp
parentb502c86f30d3ed01b795548364ab8090363eeac5 (diff)
merge release@82383 viewer-cleanup2-7-merge@82828
QAR-369
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rw-r--r--indra/newview/llfloaterpreference.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 584d7479e4..345561f551 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -446,7 +446,7 @@ void LLFloaterPreference::onBtnOK( void* userdata )
fp->apply();
fp->close(false);
- gSavedSettings.saveToFile( gSettingsFileName, TRUE );
+ gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
// save all settings, even if equals defaults