diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2010-02-04 00:33:13 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2010-02-04 00:33:13 +0000 |
| commit | 2d9a08b5d1e74907ecd6df617e1be0c94cdd254d (patch) | |
| tree | 7e8a1629c13cc8f179545c85993e723470f6cc33 /indra/newview/llmediactrl.cpp | |
| parent | 6259214fac607200c26b421fc29bc37fbb7beca1 (diff) | |
| parent | fe5dc0351c810ba3c13d7c0c81adf910451e2293 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
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; |