summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xindra/llcommon/llerror.cpp3
-rwxr-xr-xindra/llcommon/tests/llsdserialize_test.cpp3
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 1b1aada8c1..590e236090 100755
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -928,7 +928,8 @@ namespace
if (show_location && (r->wantsLocation() || level == LLError::LEVEL_ERROR || s.mPrintLocation))
{
- message_stream << site.mLocationString << " ";
+ message_stream << site.mLocationString;
+ message_stream << " ";
}
if (show_time && r->wantsTime() && s.mTimeFunction != NULL)
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 235008a5ae..ad89380e36 100755
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -1723,5 +1723,8 @@ namespace tut
"This string\n"
"has several\n"
"lines.");
+
+ bool loop = true;
+ while(loop) {}
}
}