diff options
author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-29 18:01:02 +0200 |
---|---|---|
committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-29 18:01:02 +0200 |
commit | 675df36965c346f323bb2025cd832a4dc7c9cdce (patch) | |
tree | cd4f950defd428e37340229013502d8d8ee48c88 /indra/llcommon/lluri.cpp | |
parent | 67d006e404d830931db17814e8da38cc55332152 (diff) | |
parent | 86609394caf1ebb20dd90de37b9af1471ae8aa20 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llcommon/lluri.cpp')
-rw-r--r-- | indra/llcommon/lluri.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/llcommon/lluri.cpp b/indra/llcommon/lluri.cpp index f6e8f01f0e..9d4f3a98f0 100644 --- a/indra/llcommon/lluri.cpp +++ b/indra/llcommon/lluri.cpp @@ -46,10 +46,21 @@ void encode_character(std::ostream& ostr, std::string::value_type val) { - ostr << "%" << std::uppercase << std::hex << std::setw(2) << std::setfill('0') + ostr << "%" + + << std::uppercase + << std::hex + << std::setw(2) + << std::setfill('0') + // VWR-4010 Cannot cast to U32 because sign-extension on // chars > 128 will result in FFFFFFC3 instead of F3. - << static_cast<S32>(static_cast<U8>(val)); + << static_cast<S32>(static_cast<U8>(val)) + + // reset stream state + << std::nouppercase + << std::dec + << std::setfill(' '); } // static |