diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2011-06-06 15:35:52 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2011-06-06 15:35:52 -0700 |
| commit | c24a5a3fb5e24ffe3faddb5c71e884d9a1513db0 (patch) | |
| tree | f86db3b8b82c734a60dc15cb3d0e79f990803adb /indra/llui | |
| parent | 73bbcfb07bdb0ea5828a2e214b87c4fabe805eaa (diff) | |
| parent | 325c2b216907b84b02b425103b011a556222b474 (diff) | |
automated merge
Diffstat (limited to 'indra/llui')
| -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 |