From fc8d6384b744805631ae1183c52908f49e2a4765 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 24 Jul 2012 07:55:45 -0400
Subject: In getUniqueID(), don't forget to reset formatting on log stream.
 Otherwise later log fields start showing up with zero fill, etc.

---
 indra/newview/llmachineid.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'indra/newview/llmachineid.cpp')

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;
 }
-
-
-
-
-- 
cgit v1.2.3