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

Merge remote-tracking branch 'siana/master'

Browse Source
This commit is contained in:
Aleric Inglewood
2012-02-19 23:54:59 +01:00
parent 66ccff964b c3aa321d51
commit 39f8deb498
40 changed files with 243 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llstartup.cpp
View File

@@ -1019,7 +1019,7 @@ bool idle_startup()
}
else
{
gDirUtilp->setLindenUserDir(gHippoGridManager->getCurrentGridNick(), firstname, lastname);
gDirUtilp->setLindenUserDir(gHippoGridManager->getConnectedGrid()->getGridNick(), firstname, lastname);
}
LLFile::mkdir(gDirUtilp->getLindenUserDir());
@@ -1059,7 +1059,7 @@ bool idle_startup()
}
else
{
gDirUtilp->setPerAccountChatLogsDir(gHippoGridManager->getCurrentGridNick(),
gDirUtilp->setPerAccountChatLogsDir(gHippoGridManager->getConnectedGrid()->getGridNick(),
gSavedSettings.getString("FirstName"), gSavedSettings.getString("LastName") );
}
LLFile::mkdir(gDirUtilp->getChatLogsDir());