diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2010-06-22 18:33:54 +0100 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2010-06-22 18:33:54 +0100 |
| commit | 4a3fd5686768ab35b6b22c15d6ce7b6550212fad (patch) | |
| tree | 82002d0a69e63adb3e04e35cae2d107eb50200f1 /indra | |
| parent | a42cf03807385c214118298821d532f5b6b4d984 (diff) | |
| parent | 4c31f60bba890e5c320c4bc6fd0ca1c5ce741830 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
Diffstat (limited to 'indra')
| -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..f5eb552d99 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())); + // imbue() throws if the locale is unknown! (EXT-7926) + try + { + strStream.imbue(std::locale(sLocale.c_str())); + } catch (const std::exception &e) + { + LL_WARNS_ONCE("Locale") << "Cannot set locale to " << sLocale << LL_ENDL; + } } if (!intDecimals) |