diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-10-17 10:31:59 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-10-17 10:31:59 -0400 |
| commit | 036c52fcdf425fe79a9aa6682cd7c7fe709a2442 (patch) | |
| tree | 80b637dd5876fa63fa247567aa5c267cfaf10441 /indra/llvfs | |
| parent | 3abc0095c9e39faf8976ef815b0da656423c4905 (diff) | |
| parent | bffe112cf5a1b9dd8acf5146c733a0fe186f6e89 (diff) | |
Automated merge with ssh://bitbucket.org/nat_linden/viewer-poseidon
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/lldir.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 2069888774..18836e54b0 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -42,6 +42,7 @@ #include "lldiriterator.h" #include "stringize.h" +#include "llstring.h" #include <boost/filesystem.hpp> #include <boost/foreach.hpp> #include <boost/range/begin.hpp> @@ -317,9 +318,9 @@ const std::string& LLDir::getChatLogsDir() const void LLDir::setDumpDir( const std::string& path ) { LLDir::sDumpDir = path; - if (! sDumpDir.empty() && sDumpDir.rbegin() == mDirDelimiter.rbegin() ) + if (LLStringUtil::endsWith(sDumpDir, mDirDelimiter)) { - sDumpDir.erase(sDumpDir.size() -1); + sDumpDir.erase(sDumpDir.size() - mDirDelimiter.size()); } } |