diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-04 11:44:11 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-04 11:44:11 +0000 |
commit | 05e15ccb82541494bf7145652140de187d838cda (patch) | |
tree | 59e7772de3cd038bf1e1e222abbb7f0cdf315331 /indra/newview/llmediactrl.cpp | |
parent | 1805369b58d98677c726bb0bcb52618bd66e8fdd (diff) | |
parent | 56ca1aebb866b7d7e1526e31797dd7e07fcb74a8 (diff) |
merge from viewer2.
Diffstat (limited to 'indra/newview/llmediactrl.cpp')
-rw-r--r-- | indra/newview/llmediactrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index d464862eed..3c34d26692 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -542,9 +542,9 @@ void LLMediaCtrl::navigateToLocalPage( const std::string& subdir, const std::str if (! gDirUtilp->fileExists(expanded_filename)) { - if (language != "en-us") + if (language != "en") { - expanded_filename = gDirUtilp->findSkinnedFilename("html", "en-us", filename); + expanded_filename = gDirUtilp->findSkinnedFilename("html", "en", filename); if (! gDirUtilp->fileExists(expanded_filename)) { llwarns << "File " << subdir << delim << filename_in << "not found" << llendl; |