diff options
| author | Jacek Antonelli | 2008-08-15 23:44:48 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:44:48 -0500 |
| commit | 9b4f54c826ffa4f94efa866068c9d6ecdfb4b424 (patch) | |
| tree | 2f8ae193ab487088962e628f1ee9dee2f5901f01 /linden/indra/newview/llstartup.cpp | |
| parent | Second Life viewer sources 1.13.2.12 (diff) | |
| download | meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.zip meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.gz meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.bz2 meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.xz | |
Second Life viewer sources 1.13.2.15
Diffstat (limited to '')
| -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); |