diff options
| author | Oz Linden <oz@lindenlab.com> | 2020-08-24 13:11:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2020-08-24 13:11:07 -0400 |
| commit | a9d271c5a26306486045293e9fe7941e3b72e370 (patch) | |
| tree | 85b57b68b36ecce5f55643bc903c5b09526de5a9 /indra/llvfs | |
| parent | 9834955be072aeac3f886de2eaf1e075000108c7 (diff) | |
| parent | e8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff) | |
SL-10297 merged 6.4.7
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/lldir.cpp | 2 | ||||
| -rw-r--r-- | indra/llvfs/llvfs.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 2076ce334e..10fbc06c61 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -1090,7 +1090,7 @@ LLDir::SepOff LLDir::needSep(const std::string& path, const std::string& name) c { // But if BOTH path and name bring a separator, we need not add one. // Moreover, we should actually skip the leading separator of 'name'. - return SepOff(false, seplen); + return SepOff(false, (unsigned short)seplen); } // Here we know that either path_ends_sep or name_starts_sep is true -- // but not both. So don't add a separator, and don't skip any characters: diff --git a/indra/llvfs/llvfs.h b/indra/llvfs/llvfs.h index dca5ff4ad5..42feafe20b 100644 --- a/indra/llvfs/llvfs.h +++ b/indra/llvfs/llvfs.h @@ -31,6 +31,7 @@ #include "lluuid.h" #include "llassettype.h" #include "llthread.h" +#include "llmutex.h" enum EVFSValid { |