Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Lirusaito/Canon' into Cupcake

Browse Source
This commit is contained in:
Drake Arconis
2013-03-04 12:17:41 -05:00
parent b800320a49 3effb23f08
commit b667c81f84
71 changed files with 3341 additions and 1921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llstartup.cpp
View File

@@ -1046,7 +1046,8 @@ bool idle_startup()
//Default the path if one isn't set.
if (gSavedPerAccountSettings.getString("InstantMessageLogPath").empty())
{
gDirUtilp->setChatLogsDir(gDirUtilp->getOSUserAppDir());
const std::string dir = gSavedSettings.getString("InstantMessageLogPathAnyAccount");
gDirUtilp->setChatLogsDir(dir.empty() ? gDirUtilp->getOSUserAppDir() : dir);
gSavedPerAccountSettings.setString("InstantMessageLogPath",gDirUtilp->getChatLogsDir());
}
else