diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:51:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:51:41 -0400 |
| commit | c5ae838ce3cd8521b7b4817f153560e03a8dcc32 (patch) | |
| tree | 7a489631ed3811ae52fab7bbf6b5a1075aa20e65 /indra/llvfs/lldir.cpp | |
| parent | ba0c369aa20cdbfd7940a2435dd3c6630f0d54ae (diff) | |
| parent | 4047349ade461fa6bac43da2a14c6e7689918aa1 (diff) | |
pull improved avatar physics ui and other improvements from Seraph
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; |