diff options
author | Brad Linden <brad@lindenlab.com> | 2024-05-20 11:14:29 -0700 |
---|---|---|
committer | Brad Linden <brad@lindenlab.com> | 2024-05-20 11:14:29 -0700 |
commit | 6af5db09faf5ea33a2d4c47b64e76f42edae178a (patch) | |
tree | d746c96bab1bfd44c6373926608e91c0f2fd9e49 /indra/newview/llmediactrl.cpp | |
parent | eab232d3ed49bfb1f873e332ff57ec8c311c163b (diff) | |
parent | 6d6eabca44d08d5b97bfe3e941d2b9687c2246ea (diff) |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
Diffstat (limited to 'indra/newview/llmediactrl.cpp')
-rw-r--r-- | indra/newview/llmediactrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 72fbab406b..5461f98624 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -633,7 +633,7 @@ void LLMediaCtrl::navigateTo( std::string url_in, std::string mime_type, bool cl void LLMediaCtrl::navigateToLocalPage( const std::string& subdir, const std::string& filename_in ) { std::string filename(gDirUtilp->add(subdir, filename_in)); - std::string expanded_filename = gDirUtilp->findSkinnedFilename(LLDir::HTML, filename); + std::string expanded_filename = gDirUtilp->findSkinnedFilename("html", filename); if (expanded_filename.empty()) { |