summaryrefslogtreecommitdiff
path: root/indra/newview/llfilepicker.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-03-07 11:27:43 -0800
committerRider Linden <rider@lindenlab.com>2018-03-07 11:27:43 -0800
commit7b56db31f91545102744885b4f70c93278e837bd (patch)
tree97bd880e3aeb1f60d667344e6693b46c8ba120eb /indra/newview/llfilepicker.cpp
parent4235231b5adbb7f064cab732f761dd359ef4b648 (diff)
parentf8c76535a35aaf245e261357a59e977bac5b2501 (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);
}
}
}