diff options
| author | Don Kjer <don@lindenlab.com> | 2011-03-23 01:26:03 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-03-23 01:26:03 +0000 |
| commit | 1e0608ff51efc69a14010f2ce5dba3acabe16e49 (patch) | |
| tree | 326e829b4233658ba8698e06ff17267618e93a62 /indra/llvfs | |
| parent | becc9d09970755f9cc0d95c46b9f2d81d5b856b5 (diff) | |
| parent | e4a4d75104916968ce03337094b1194e0daff438 (diff) | |
Merge with 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; |