diff options
Diffstat (limited to 'linden/indra/newview/llstartup.cpp')
-rw-r--r-- | linden/indra/newview/llstartup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index 5eabad3..916db16 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp | |||
@@ -685,7 +685,7 @@ BOOL idle_startup() | |||
685 | gSavedSettings.loadFromFile(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,"overrides.xml")); | 685 | gSavedSettings.loadFromFile(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,"overrides.xml")); |
686 | 686 | ||
687 | // handle the per account settings setup | 687 | // handle the per account settings setup |
688 | strcpy(gPerAccountSettingsFileName, gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, DEFAULT_SETTINGS_FILE).c_str()); | 688 | gPerAccountSettingsFileName = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, DEFAULT_SETTINGS_FILE); |
689 | 689 | ||
690 | // per account settings. Set defaults here if not found. If we get a bunch of these, eventually move to a function. | 690 | // per account settings. Set defaults here if not found. If we get a bunch of these, eventually move to a function. |
691 | gSavedPerAccountSettings.loadFromFile(gPerAccountSettingsFileName); | 691 | gSavedPerAccountSettings.loadFromFile(gPerAccountSettingsFileName); |