diff options
author | Jacek Antonelli | 2008-12-09 22:25:37 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-12-09 22:25:41 -0600 |
commit | 22b861982f2efd5d16097a012627e73b9fb85834 (patch) | |
tree | 6152a84b92c682e271bdd52d46cd1728454f679a /linden/indra/newview/llpaneldirfind.cpp | |
parent | Second Life viewer sources 1.22.1-RC (diff) | |
download | meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.zip meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.gz meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.bz2 meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.xz |
Second Life viewer sources 1.22.2-RC
Diffstat (limited to 'linden/indra/newview/llpaneldirfind.cpp')
-rw-r--r-- | linden/indra/newview/llpaneldirfind.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp index cc0a700..1b610fb 100644 --- a/linden/indra/newview/llpaneldirfind.cpp +++ b/linden/indra/newview/llpaneldirfind.cpp | |||
@@ -321,15 +321,8 @@ std::string LLPanelDirFind::getSearchURLSuffix(bool mature_in) | |||
321 | substring = "[SESSION]"; | 321 | substring = "[SESSION]"; |
322 | url.replace(url.find(substring), substring.length(), session_string); | 322 | url.replace(url.find(substring), substring.length(), session_string); |
323 | 323 | ||
324 | // set the currently selected lanaguage by asking the pref setting | 324 | // set the currently selected language by asking the pref setting |
325 | std::string language_string = LLUI::sConfigGroup->getString( "Language" ); | 325 | std::string language_string = LLUI::getLanguage(); |
326 | if ( language_string == "default" ) | ||
327 | { | ||
328 | // if "default system language" setting used, ask again | ||
329 | // (we can't do this directly since it can vary if you install | ||
330 | // under one language and select a different one using prefs) | ||
331 | language_string = gSavedSettings.getString( "SystemLanguage" ); | ||
332 | } | ||
333 | std::string language_tag = "[LANG]"; | 326 | std::string language_tag = "[LANG]"; |
334 | url.replace( url.find( language_tag ), language_tag.length(), language_string ); | 327 | url.replace( url.find( language_tag ), language_tag.length(), language_string ); |
335 | 328 | ||