summaryrefslogtreecommitdiff
path: root/indra/llvfs
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2011-03-16 22:44:29 +0000
committerTofu Buzzard <no-email>2011-03-16 22:44:29 +0000
commit0671b6abc5acee0e7df879f9a10506aa42c2169c (patch)
treebaf736cc9a5f9de8fb1fa9f9bf95be0dacc7b72f /indra/llvfs
parent1dffa1c78cd623fe8c930e128312260647bf91e7 (diff)
parent752b3fdbe044069635a2c6cd000c481561985954 (diff)
merge
Diffstat (limited to 'indra/llvfs')
-rw-r--r--indra/llvfs/lldir.cpp6
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;