summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-10-08 16:48:25 -0600
committerDave Houlton <euclid@lindenlab.com>2020-10-08 17:16:22 -0600
commit7cd076c796126692c308df5416b42b24a96609fb (patch)
tree2061ad71bfdf04be832d8213b3fee643e6aec2ca /indra/llui
parent18ddd70d96dc572ad94c81f9a1a3d08d7c7cdbc7 (diff)
DRTVWR-510 remove all LL_SOLARIS conditionals
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llresmgr.cpp3
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");