diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-06-23 12:05:09 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-06-23 12:05:09 +0300 |
| commit | 6290930c98ace2d3b3d76d3be0a06df718a9a238 (patch) | |
| tree | 48584ccb08b80d120ec53f3d1df16df55cd9480b /indra/llcommon | |
| parent | e02b51f125f876cfef10f504a121693b3612155a (diff) | |
| parent | 11ec720a063b73fc042e8b06338b9526835dbb6b (diff) | |
Merge with default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llstring.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp index f14d947734..1561bda201 100644 --- a/indra/llcommon/llstring.cpp +++ b/indra/llcommon/llstring.cpp @@ -994,7 +994,14 @@ void LLStringUtil::formatNumber(std::string& numStr, std::string decimals) convertToS32 (decimals, intDecimals); if (!sLocale.empty()) { - strStream.imbue (std::locale(sLocale.c_str())); + // std::locale() throws if the locale is unknown! (EXT-7926) + try + { + strStream.imbue(std::locale(sLocale.c_str())); + } catch (const std::exception &) + { + LL_WARNS_ONCE("Locale") << "Cannot set locale to " << sLocale << LL_ENDL; + } } if (!intDecimals) |