From 7ab616c18786afcb40ab0092fe6f8c6a3a799375 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 26 Aug 2013 19:58:29 -0700
Subject: [PATCH] BUILDFIX: fix for windows unit test failures...don't do
unnecessary manipulation of callsite strings in llerror
---
indra/llcommon/llerror.cpp | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index a51f8f216ac..96dbaa572ad 100755
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -926,7 +926,6 @@ namespace
std::ostringstream message_stream;
- const_cast<LLError::CallSite&>(site).mTagString += " ";
if (show_location && (r->wantsLocation() || level == LLError::LEVEL_ERROR || s.mPrintLocation))
{
message_stream << site.mLocationString << " ";
@@ -937,16 +936,16 @@ namespace
message_stream << s.mTimeFunction() << " ";
}
- if (show_tags && r->wantsTags())
+ if (show_level && r->wantsLevel())
{
- message_stream << site.mTagString << " ";
+ message_stream << site.mLevelString << " ";
}
- if (show_level && r->wantsLevel())
+ if (show_tags && r->wantsTags())
{
- message_stream << site.mLevelString << " ";
+ message_stream << site.mTagString << " ";
}
-
+
if (show_function && r->wantsFunctionName())
{
message_stream << site.mFunctionString << " ";
@@ -954,8 +953,7 @@ namespace
message_stream << message;
- std::string final_message = message_stream.str();
- r->recordMessage(level, final_message);
+ r->recordMessage(level, message_stream.str());
}
}
}
@@ -1159,10 +1157,6 @@ namespace LLError
Globals& g = Globals::get();
Settings& s = Settings::get();
- //const_cast<CallSite&>(site).mTagString += " ";
- std::string tag_string = site.mTagString;
- tag_string += " ";
-
std::string message = out->str();
if (out == &g.messageStream)
{
--
GitLab