diff options
author | Richard Linden <none@none> | 2012-02-06 15:28:45 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2012-02-06 15:28:45 -0800 |
commit | 2ed1de224a45fafb12fea42e8dfb83f9728cdcf1 (patch) | |
tree | a78f96c5ada866ec93cbba72f2c7bf1daf7ade80 /indra/newview/llstartup.cpp | |
parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) | |
parent | e328dcf4062177c903d3099d0d16477824d23025 (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r-- | indra/newview/llstartup.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 3923b4510a..0ac8c1fe39 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -880,7 +880,6 @@ bool idle_startup() LLFile::mkdir(gDirUtilp->getLindenUserDir()); // Set PerAccountSettingsFile to the default value. - std::string per_account_settings_file = LLAppViewer::instance()->getSettingsFilename("Default", "PerAccount"); gSavedSettings.setString("PerAccountSettingsFile", gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, LLAppViewer::instance()->getSettingsFilename("Default", "PerAccount"))); |