Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github-siana:siana/SingularityViewer into future

Browse Source
This commit is contained in:
Siana Gearz
2011-08-03 01:01:00 +02:00
parent 82fc160abe ee9b689cb4
commit 87070be7e3
10 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/llresmgr.cpp
View File

@@ -453,15 +453,17 @@ const std::string LLLocale::USER_LOCALE("en_US.utf8");
const std::string LLLocale::SYSTEM_LOCALE("C");
#endif
static std::string PrevFailedLocaleString = "";
LLLocale::LLLocale(const std::string& locale_string)
{
mPrevLocaleString = setlocale( LC_ALL, NULL );
char* new_locale_string = setlocale( LC_ALL, locale_string.c_str());
if ( new_locale_string == NULL)
if ( new_locale_string == NULL && PrevFailedLocaleString != locale_string )
{
llwarns << "Failed to set locale " << locale_string.c_str() << llendl;
setlocale(LC_ALL, SYSTEM_LOCALE.c_str());
PrevFailedLocaleString = locale_string;
}
//else
//{