diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-03-09 11:52:43 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-03-09 11:52:43 -0800 |
| commit | 90c824d10dbf4468dfdd9ffebf7456f81964391a (patch) | |
| tree | 812cc4dd06d128fbbf1e7c960f96e5476eb925f6 /indra/llvfs | |
| parent | 6158929e3ee87bc879c99d35963a151006394ed7 (diff) | |
| parent | f47a9a4ea3d40ecaf03e853469b1570a4ad72ce7 (diff) | |
Merge
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; |