summaryrefslogtreecommitdiff
path: root/indra/newview/llfilepicker.cpp
diff options
context:
space:
mode:
authorGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-03-03 01:04:04 +0000
committerGraham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com>2018-03-03 01:04:04 +0000
commit56609e11869f8ca70727512d7d0c4aa475b5a178 (patch)
treea3072f49c1f212d873030b09c3457cd6cf6b6d75 /indra/newview/llfilepicker.cpp
parentf8134b152d1a7273e27a224eac11d52c0a6f94c9 (diff)
parentaf9069edbff9df73cd75753b696aabd1ae8769b5 (diff)
Merge
Diffstat (limited to 'indra/newview/llfilepicker.cpp')
-rw-r--r--indra/newview/llfilepicker.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 7e92643b93..125a823e58 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -341,7 +341,7 @@ BOOL LLFilePicker::getMultipleOpenFiles(ELoadFilter filter)
dirname = filename + "\\";
else
mFiles.push_back(dirname + filename);
- tptrw += filename.size();
+ tptrw += wcslen(tptrw);
}
}
}