diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-22 16:41:50 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-06-22 16:41:50 -0400 |
| commit | d12be5978eb948adbb4f3c41f2d90a826af1fc89 (patch) | |
| tree | 028a6991be06be4db7df1375429dfd9b7d980c2e /indra/llcommon | |
| parent | 449de8e6085c1ddb7a4bd9dcd835aecbf45a7d11 (diff) | |
| parent | 566a6191131249e5f2fbb0015522092d04d26b93 (diff) | |
merge
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) |