diff options
Diffstat (limited to 'indra/llcommon')
| -rwxr-xr-x | indra/llcommon/llerror.cpp | 16 | 
1 files changed, 11 insertions, 5 deletions
| diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp index 2100989316..5ed348e13c 100755 --- a/indra/llcommon/llerror.cpp +++ b/indra/llcommon/llerror.cpp @@ -119,6 +119,7 @@ namespace {  				LL_INFOS() << "Error setting log file to " << filename << LL_ENDL;  			}  			mWantsTime = true; +            mWantsTags = true;  		}  		~RecordToFile() @@ -558,7 +559,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) ? "" : ",");  		}  	} @@ -931,14 +932,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())  			{ | 
