diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-07-22 19:01:52 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-07-22 19:01:52 +0000 |
| commit | 0c0391cc7114bd2e9e4462c40e88814326f61bc2 (patch) | |
| tree | 2906124fe8371b6336e6f7231cd890d267a75d6d /indra/llui/llui.cpp | |
| parent | ed386ae547c225e352c39e8d14921572ee534b0b (diff) | |
QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release
merge Branch_1-20-14-Viewer-merge -> release
Includes Branch_1-20-Viewer-2 through 92456
Diffstat (limited to 'indra/llui/llui.cpp')
| -rw-r--r-- | indra/llui/llui.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index ac263250ff..2b6895aa09 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1666,13 +1666,13 @@ std::string LLUI::locateSkin(const std::string& filename) localization = sConfigGroup->getString("SystemLanguage"); } std::string local_skin = "xui" + slash + localization + slash + filename; - found_file = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, local_skin); + found_file = gDirUtilp->findSkinnedFilename(local_skin); } } if (!gDirUtilp->fileExists(found_file)) { std::string local_skin = "xui" + slash + "en-us" + slash + filename; - found_file = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, local_skin); + found_file = gDirUtilp->findSkinnedFilename(local_skin); } if (!gDirUtilp->fileExists(found_file)) { |