diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:08:43 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-07 21:08:43 +0300 |
| commit | 7587f0dd88526e61a4741ad8e2d9894027de1ffb (patch) | |
| tree | 5046dba2ef946683f7360b2b0883c9c24b6147ae /indra/llui | |
| parent | 3fcc1739663f939c6c67415f1d56b64c35a52a38 (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge branch 'master' into DRTVWR-483
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llresmgr.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llui/llresmgr.cpp b/indra/llui/llresmgr.cpp index 6e924c1f19..d65c220974 100644 --- a/indra/llui/llresmgr.cpp +++ b/indra/llui/llresmgr.cpp @@ -295,9 +295,6 @@ const std::string LLLocale::SYSTEM_LOCALE("English_United States.1252"); #elif LL_DARWIN const std::string LLLocale::USER_LOCALE("en_US.iso8859-1");// = LLStringUtil::null; const std::string LLLocale::SYSTEM_LOCALE("en_US.iso8859-1"); -#elif LL_SOLARIS -const std::string LLLocale::USER_LOCALE("en_US.ISO8859-1"); -const std::string LLLocale::SYSTEM_LOCALE("C"); #else // LL_LINUX likes this const std::string LLLocale::USER_LOCALE("en_US.utf8"); const std::string LLLocale::SYSTEM_LOCALE("C"); |