summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2016-10-10 10:50:22 -0700
committerGlenn Glazer <coyot@lindenlab.com>2016-10-10 10:50:22 -0700
commit64ab1979db23c984cb29f4d6e984369b938e5016 (patch)
tree8e197fe45d16f20fb96e1ece049079ba9d28872c /indra
parent51bb369a39142ff5049f753099f9638ce68b95dc (diff)
maint-6633: fix ordering of log entries
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/llerror.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 5ed348e13c..345ec3661b 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -921,11 +921,6 @@ namespace
std::ostringstream message_stream;
- if (show_location && (r->wantsLocation() || level == LLError::LEVEL_ERROR || s->mPrintLocation))
- {
- message_stream << site.mLocationString << " ";
- }
-
if (show_time && r->wantsTime() && s->mTimeFunction != NULL)
{
message_stream << s->mTimeFunction() << " ";
@@ -940,6 +935,11 @@ namespace
{
message_stream << site.mTagString;
}
+
+ if (show_location && (r->wantsLocation() || level == LLError::LEVEL_ERROR || s->mPrintLocation))
+ {
+ message_stream << site.mLocationString << " ";
+ }
if ((show_level && r->wantsLevel())||
(show_tags && r->wantsTags()))
{