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

Merge vmm up to 3a62616f3dd8bd512fcdfd29ef033b2505b11213

Browse Source
This commit is contained in:
Inusaito Sayori
2015-08-01 13:07:30 -04:00
committed by Lirusaito
parent 1d6e2b4182
commit fd4155f4b6
12 changed files with 185 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
indra/llcommon/llerror.cpp
View File

@@ -120,6 +120,7 @@ namespace {
LL_INFOS() << "Error setting log file to " << filename << LL_ENDL;
}
mWantsTime = true;
mWantsTags = true;
}
~RecordToFile()
@@ -600,7 +601,7 @@ namespace LLError
mFunctionString += std::string(mFunction) + ":";
for (size_t i = 0; i < mTagCount; i++)
{
mTagString += std::string("#") + mTags[i] + ((i == mTagCount - 1) ? "" : " ");
mTagString += std::string("#") + mTags[i] + ((i == mTagCount - 1) ? "" : ",");
}
}
}
@@ -983,13 +984,19 @@ namespace
}
if (show_level && r->wantsLevel())
{
message_stream << site.mLevelString << " ";
}
{
message_stream << site.mLevelString;
}
if (show_tags && r->wantsTags())
{
message_stream << site.mTagString << " ";
message_stream << site.mTagString;
}
if ((show_level && r->wantsLevel())||
(show_tags && r->wantsTags()))
{
message_stream << " ";
}
if (show_function && r->wantsFunctionName())