diff options
| author | Eli Linden <eli@lindenlab.com> | 2011-03-10 12:18:27 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2011-03-10 12:18:27 -0800 |
| commit | 70aff7fd157b1e2894a4d065caf9a63848d072b0 (patch) | |
| tree | dee262d1b7ac3ef14eebeb71d55e9b0755209148 /indra/llvfs/lldir.cpp | |
| parent | 64e672d9d92d1b8f92e968b0164b2212a71120da (diff) | |
| parent | 378585e7f089b62b7a0dd69adde48cd63fc7bacc (diff) | |
Merge
Diffstat (limited to 'indra/llvfs/lldir.cpp')
| -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; |