diff options
| author | prep linden <prep@lindenlab.com> | 2011-03-16 17:10:06 -0400 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2011-03-16 17:10:06 -0400 |
| commit | 4b54ec7965cd874af4d0eef381d0bc9fe06cff04 (patch) | |
| tree | dd967a4263907ad7de733622cff8f886da1ac7de /indra/llvfs | |
| parent | aaaddfe08942ff15bbe0c6549dc82dda95ce3ba1 (diff) | |
| parent | 037a83cd47e016f70092bccfdb2c13e759c6ff0a (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; |