Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/llfilesystem/lldir.cpp b/indra/llfilesystem/lldir.cpp
index cbf4c1ffb8..483ef0fd02 100644
--- a/indra/llfilesystem/lldir.cpp
+++ b/indra/llfilesystem/lldir.cpp
@@ -638,7 +638,7 @@ std::string LLDir::getBaseFileName(const std::string& filepath, bool strip_exten
 std::string LLDir::getDirName(const std::string& filepath) const
 {
     std::size_t offset = filepath.find_last_of(getDirDelimiter());
-    S32 len = (offset == std::string::npos) ? 0 : offset;
+    auto len = (offset == std::string::npos) ? 0 : offset;
     std::string dirname = filepath.substr(0, len);
     return dirname;
 }
@@ -883,8 +883,8 @@ std::string LLDir::getScrubbedFileName(const std::string uncleanFileName)
     // replace any illegal file chars with and underscore '_'
     for( unsigned int i = 0; i < illegalChars.length(); i++ )
     {
-        int j = -1;
-        while((j = name.find(illegalChars[i])) > -1)
+        std::string::size_type j = -1;
+        while((j = name.find(illegalChars[i])) > std::string::npos)
         {
             name[j] = '_';
         }