summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-07-24 07:55:45 -0400
committerNat Goodspeed <nat@lindenlab.com>2012-07-24 07:55:45 -0400
commitfc8d6384b744805631ae1183c52908f49e2a4765 (patch)
treeaf64c6b6f508c580de6508b7f0aae2725fb90927 /indra
parent28c81e92ccb79920f059b040989f0b03c622c03c (diff)
In getUniqueID(), don't forget to reset formatting on log stream.
Otherwise later log fields start showing up with zero fill, etc.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llmachineid.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llmachineid.cpp b/indra/newview/llmachineid.cpp
index 82e412d845..cd6473921d 100644
--- a/indra/newview/llmachineid.cpp
+++ b/indra/newview/llmachineid.cpp
@@ -263,12 +263,9 @@ S32 LLMachineID::getUniqueID(unsigned char *unique_id, size_t len)
unsigned byte = unique_id[i];
LL_CONT << std::hex << std::setw(2) << std::setfill('0') << byte;
}
- LL_ENDL;
+ // Reset default output formatting to avoid nasty surprises!
+ LL_CONT << std::dec << std::setw(0) << std::setfill(' ') << LL_ENDL;
return 1;
}
return 0;
}
-
-
-
-