diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-10-12 11:09:25 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-10-12 11:09:25 -0400 |
| commit | 543b7ee9f7eb104497e971961fc0c39ed32ef54d (patch) | |
| tree | e20e152fa434c2d888cd1b6b256a9356618ec268 /indra/llui | |
| parent | 6ca37068080e3b26e5cb163dfd874bc0e2f4c837 (diff) | |
Fix LLUI::locateSkin() failure case; clarify lldir.cpp static init.
Per code review:
Previous refactoring of LLUI::locateSkin() preserved odd failure behavior: it
would return last-considered pathname, whether or not it exists. Changed to
emit LL_WARNS log message and return empty string.
Use Boost.Assign to simplify initialization of a couple static containers in
lldir.cpp.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llui.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index 507ced9172..6d2bc1837c 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1859,15 +1859,13 @@ std::string LLUI::locateSkin(const std::string& filename) } found_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, filename); -/*==========================================================================*| - // Hmm, if we got this far, previous implementation of this method would - // return this last found_file value whether or not it actually exists. if (gDirUtilp->fileExists(found_file)) { return found_file; } -|*==========================================================================*/ - return found_file; + LL_WARNS("LLUI") << "Can't find '" << filename + << "' in user settings, any skin directory or app_settings" << LL_ENDL; + return ""; } //static |