diff options
author | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
commit | b2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch) | |
tree | 3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/llui/llresmgr.cpp | |
parent | Second Life viewer sources 1.14.0.1 (diff) | |
download | meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2 meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz |
Second Life viewer sources 1.15.0.2
Diffstat (limited to 'linden/indra/llui/llresmgr.cpp')
-rw-r--r-- | linden/indra/llui/llresmgr.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/llui/llresmgr.cpp b/linden/indra/llui/llresmgr.cpp index a73b487..2350093 100644 --- a/linden/indra/llui/llresmgr.cpp +++ b/linden/indra/llui/llresmgr.cpp | |||
@@ -4,6 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Copyright (c) 2001-2007, Linden Research, Inc. | 5 | * Copyright (c) 2001-2007, Linden Research, Inc. |
6 | * | 6 | * |
7 | * Second Life Viewer Source Code | ||
7 | * The source code in this file ("Source Code") is provided by Linden Lab | 8 | * The source code in this file ("Source Code") is provided by Linden Lab |
8 | * to you under the terms of the GNU General Public License, version 2.0 | 9 | * to you under the terms of the GNU General Public License, version 2.0 |
9 | * ("GPL"), unless you have obtained a separate licensing agreement | 10 | * ("GPL"), unless you have obtained a separate licensing agreement |
@@ -440,8 +441,8 @@ const LLString LLLocale::SYSTEM_LOCALE("English_United States.1252"); | |||
440 | const LLString LLLocale::USER_LOCALE("en_US.iso8859-1");// = LLString::null; | 441 | const LLString LLLocale::USER_LOCALE("en_US.iso8859-1");// = LLString::null; |
441 | const LLString LLLocale::SYSTEM_LOCALE("en_US.iso8859-1"); | 442 | const LLString LLLocale::SYSTEM_LOCALE("en_US.iso8859-1"); |
442 | #else // LL_LINUX likes this | 443 | #else // LL_LINUX likes this |
443 | const LLString LLLocale::USER_LOCALE("en_US.utf8");// = LLString::null; | 444 | const LLString LLLocale::USER_LOCALE("en_US.utf8"); |
444 | const LLString LLLocale::SYSTEM_LOCALE("en_US.utf8"); | 445 | const LLString LLLocale::SYSTEM_LOCALE("C"); |
445 | #endif | 446 | #endif |
446 | 447 | ||
447 | 448 | ||