diff options
author | simon@lindenlab.com <simon@lindenlab.com> | 2011-06-21 09:36:31 -0700 |
---|---|---|
committer | simon@lindenlab.com <simon@lindenlab.com> | 2011-06-21 09:36:31 -0700 |
commit | d11cabc4898a7a1995ed7c89d2cdac46dfcf24ec (patch) | |
tree | 9f8e5e57d4ed074e148227c56556bcace90e2e3a /indra/llui/llresmgr.cpp | |
parent | c0c0a2b9a5f41fc06619330a81c34955a39ddfe2 (diff) | |
parent | ede3b577d8cebd5065514bb485e2cbd93dd5b05a (diff) |
Merge with latest lindenlab/viewer-development
Diffstat (limited to 'indra/llui/llresmgr.cpp')
-rw-r--r-- | indra/llui/llresmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llresmgr.cpp b/indra/llui/llresmgr.cpp index 39385786bc..820e7cb26a 100644 --- a/indra/llui/llresmgr.cpp +++ b/indra/llui/llresmgr.cpp @@ -337,7 +337,7 @@ LLLocale::LLLocale(const std::string& locale_string) char* new_locale_string = setlocale( LC_ALL, locale_string.c_str()); if ( new_locale_string == NULL) { - llwarns << "Failed to set locale " << locale_string << llendl; + LL_WARNS_ONCE("LLLocale") << "Failed to set locale " << locale_string << LL_ENDL; setlocale(LC_ALL, SYSTEM_LOCALE.c_str()); } //else |