aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llwebbrowserctrl.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-12-09 22:25:37 -0600
committerJacek Antonelli2008-12-09 22:25:41 -0600
commit22b861982f2efd5d16097a012627e73b9fb85834 (patch)
tree6152a84b92c682e271bdd52d46cd1728454f679a /linden/indra/newview/llwebbrowserctrl.cpp
parentSecond Life viewer sources 1.22.1-RC (diff)
downloadmeta-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 '')
-rw-r--r--linden/indra/newview/llwebbrowserctrl.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/linden/indra/newview/llwebbrowserctrl.cpp b/linden/indra/newview/llwebbrowserctrl.cpp
index 8c56e5c..0598a63 100644
--- a/linden/indra/newview/llwebbrowserctrl.cpp
+++ b/linden/indra/newview/llwebbrowserctrl.cpp
@@ -483,13 +483,7 @@ void LLWebBrowserCtrl::navigateTo( std::string urlIn )
483 483
484void LLWebBrowserCtrl::navigateToLocalPage( const std::string& subdir, const std::string& filename_in ) 484void LLWebBrowserCtrl::navigateToLocalPage( const std::string& subdir, const std::string& filename_in )
485{ 485{
486 std::string language = gSavedSettings.getString("Language"); 486 std::string language = LLUI::getLanguage();
487
488 if(language == "default")
489 {
490 language = gSavedSettings.getString("SystemLanguage");
491 }
492
493 std::string delim = gDirUtilp->getDirDelimiter(); 487 std::string delim = gDirUtilp->getDirDelimiter();
494 std::string filename; 488 std::string filename;
495 489