summaryrefslogtreecommitdiff
path: root/indra/newview/llfilepicker.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2018-03-02 00:47:08 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2018-03-02 00:47:08 +0200
commitaf9069edbff9df73cd75753b696aabd1ae8769b5 (patch)
tree123661ba69903fccccb1501f97c05ce2c1c73411 /indra/newview/llfilepicker.cpp
parent723e0b2e6bfa348e6270677b1745ad29311a19c1 (diff)
parentf8c76535a35aaf245e261357a59e977bac5b2501 (diff)
Merged in lindenlab/viewer-release
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);
}
}
}