diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-04-04 19:49:24 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-04-04 19:49:24 +0000 |
| commit | 98740db8fd5875033d08b6aef6d9bf5c3c49eeee (patch) | |
| tree | dd0e83734e50ffd4d9f87eb2ed4091f867f2f1fd /indra/llui/llresmgr.cpp | |
| parent | aa96d1fddff3d5bf68a5014229a0d20584937222 (diff) | |
svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/llui/llresmgr.cpp')
| -rw-r--r-- | indra/llui/llresmgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llresmgr.cpp b/indra/llui/llresmgr.cpp index 96ca5637e6..0d78a45b26 100644 --- a/indra/llui/llresmgr.cpp +++ b/indra/llui/llresmgr.cpp @@ -421,8 +421,8 @@ const LLString LLLocale::SYSTEM_LOCALE("English_United States.1252"); const LLString LLLocale::USER_LOCALE("en_US.iso8859-1");// = LLString::null; const LLString LLLocale::SYSTEM_LOCALE("en_US.iso8859-1"); #else // LL_LINUX likes this -const LLString LLLocale::USER_LOCALE("en_US.utf8");// = LLString::null; -const LLString LLLocale::SYSTEM_LOCALE("en_US.utf8"); +const LLString LLLocale::USER_LOCALE("en_US.utf8"); +const LLString LLLocale::SYSTEM_LOCALE("C"); #endif |