From 7f50e28b0f3905f95299f7d5d63e0fd82e103bed Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 23 Jan 2007 19:12:31 +0000 Subject: merge -r 56842:57026 maintenance. --- indra/newview/llstartup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llstartup.cpp') diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 2119bf2d70..eda759cc2c 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -666,7 +666,7 @@ BOOL idle_startup() gSavedSettings.loadFromFile(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,"overrides.xml")); // handle the per account settings setup - strcpy(gPerAccountSettingsFileName, gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, DEFAULT_SETTINGS_FILE).c_str()); + gPerAccountSettingsFileName = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, DEFAULT_SETTINGS_FILE); // per account settings. Set defaults here if not found. If we get a bunch of these, eventually move to a function. gSavedPerAccountSettings.loadFromFile(gPerAccountSettingsFileName); -- cgit v1.3