Second Life viewer sources 1.19.1.1

1 files changed, 12 insertions, 0 deletions

diff --git a/linden/indra/newview/llpaneldirfind.cpp b/linden/indra/newview/llpaneldirfind.cpp
index 5d34d47..294c535 100644
--- a/linden/indra/newview/llpaneldirfind.cpp
+++ b/linden/indra/newview/llpaneldirfind.cpp
@@ -297,6 +297,18 @@ std::string LLPanelDirFindAll::getSearchURLSuffix(bool mature_in)
         substring = "[SESSION]";
         url.replace(url.find(substring), substring.length(), session_string);
 
+        // set the currently selected lanaguage by asking the pref setting
+        std::string language_string = LLUI::sConfigGroup->getString( "Language" );
+        if ( language_string == "default" ) 
+        {
+                // if "default system language" setting used, ask again
+                // (we can't do this directly since it can vary if you install
+                // under one language and select a different one using prefs)
+                language_string = gSavedSettings.getString( "SystemLanguage" );
+        }
+        std::string language_tag = "[LANG]";
+        url.replace( url.find( language_tag ), language_tag.length(), language_string );
+
         return url;
 }