diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-03-21 10:24:07 -0700 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-03-21 10:24:07 -0700 |
| commit | 31e16be0daa10e6d66b133c308130524a7a0d881 (patch) | |
| tree | c44a007bc039e07e8ff938898d56a0534347750b /indra/llvfs | |
| parent | 15404a3c5d50f5f106f5bc443d16e172c54e3e0f (diff) | |
| parent | df63c6931e81c034887611711095e3134b9a7318 (diff) | |
Merge latest from lindenlab/viewer-development
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/lldir.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index cb898e385f..341c96f6ea 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -149,7 +149,11 @@ const std::string LLDir::findFile(const std::string& filename, const std::vector { if (!search_path_iter->empty()) { - std::string filename_and_path = (*search_path_iter) + getDirDelimiter() + filename; + std::string filename_and_path = (*search_path_iter); + if (!filename.empty()) + { + filename_and_path += getDirDelimiter() + filename; + } if (fileExists(filename_and_path)) { return filename_and_path; |