summaryrefslogtreecommitdiff
path: root/indra/llvfs
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-03-09 00:21:57 -0800
committerRichard Linden <none@none>2011-03-09 00:21:57 -0800
commit8886460a22a6cc6307dd0909219b4dd442c55f8d (patch)
treed99260fc9f97eced6f76667e11a618ed40f3db23 /indra/llvfs
parentbc22d31caee8479a89366155062df45302021bba (diff)
SOCIAL-654 WIP Items purchased on Marketplace.secondlife.com while logged into Minimal skin are declined and not present in inventory
made notification text skinnable
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;