diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-21 07:00:20 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-21 07:00:20 -0400 |
| commit | d3023153e9c7aa2eaf18468e8d81aebf0d6223e0 (patch) | |
| tree | f1265d15e702f1dd449476fd5e7b956ccd7f33f8 /indra/llvfs | |
| parent | 7766d424d0f8cf8a6c882f50bc4dd04bf8f2096b (diff) | |
| parent | cb47ae3264f3d9d22add17f2cbc5699c8620705f (diff) | |
merge changes for storm-1035
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; |