mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-16 08:51:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/data-management' of github.com:OpenSpace/OpenSpace into feature/data-management

Browse Source
This commit is contained in:
Emil Axelsson
2017-11-10 16:10:41 +01:00
parent cb07af4a2b 8da01993cd
commit c479cb5079
10 changed files with 75 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/engine/openspaceengine.cpp
View File

@@ -715,13 +715,9 @@ void OpenSpaceEngine::loadFonts() {
LERRORC(err.component, err.message);
}
}
<<<<<<< HEAD
void OpenSpaceEngine::configureLogging(bool consoleLog) {
=======
void OpenSpaceEngine::configureLogging() {
>>>>>>> afa1d6d33edf4eaa62bd629721d5a6d5135e3739
const std::string KeyLogLevel =
ConfigurationManager::KeyLogging + '.' + ConfigurationManager::PartLogLevel;
const std::string KeyLogImmediateFlush =
@@ -743,14 +739,9 @@ void OpenSpaceEngine::configureLogging() {
level,
immediateFlush ? ImmediateFlush::Yes : ImmediateFlush::No
);
<<<<<<< HEAD
if (consoleLog) {
LogMgr.addLog(std::make_unique<ConsoleLog>());
}
=======
LogMgr.addLog(std::make_unique<ConsoleLog>());
>>>>>>> afa1d6d33edf4eaa62bd629721d5a6d5135e3739
}
if (configurationManager().hasKeyAndValue<ghoul::Dictionary>(KeyLogs)) {