Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix

# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llmachineid.cpp

3 files changed, 8 insertions, 2 deletions

diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp
index 7a30cd4cea..69b23f9cf8 100644
--- a/indra/llvfs/lldir.cpp
+++ b/indra/llvfs/lldir.cpp
@@ -337,6 +337,11 @@ const std::string &LLDir::getDumpDir() const
 	return LLDir::sDumpDir;
 }
 
+bool LLDir::dumpDirExists() const
+{
+    return !sDumpDir.empty();
+}
+
 const std::string &LLDir::getPerAccountChatLogsDir() const
 {
 	return mPerAccountChatLogsDir;
diff --git a/indra/llvfs/lldir.h b/indra/llvfs/lldir.h
index c114f9957b..b9a046ba33 100644
--- a/indra/llvfs/lldir.h
+++ b/indra/llvfs/lldir.h
@@ -90,6 +90,7 @@ class LLDir
 	const std::string &getLindenUserDir() const;	// Location of the Linden user dir.
 	const std::string &getChatLogsDir() const;	// Location of the chat logs dir.
 	const std::string &getDumpDir() const;	// Location of the per-run dump dir.
+	bool              dumpDirExists() const;
 	const std::string &getPerAccountChatLogsDir() const;	// Location of the per account chat logs dir.
 	const std::string &getTempDir() const;			// Common temporary directory
 	const std::string  getCacheDir(bool get_default = false) const;	// Location of the cache.
diff --git a/indra/llvfs/lldiriterator.cpp b/indra/llvfs/lldiriterator.cpp
index 3eb64e69d9..f57bf4ebc6 100644
--- a/indra/llvfs/lldiriterator.cpp
+++ b/indra/llvfs/lldiriterator.cpp
@@ -27,8 +27,8 @@
 #include "lldiriterator.h"
 
 #include "fix_macros.h"
+#include "llregex.h"
 #include <boost/filesystem.hpp>
-#include <boost/regex.hpp>
 
 namespace fs = boost::filesystem;
 
@@ -131,7 +131,7 @@ bool LLDirIterator::Impl::next(std::string &fname)
 		{
 			boost::smatch match;
 			std::string name = mIter->path().filename().string();
-			found = boost::regex_match(name, match, mFilterExp);
+			found = ll_regex_match(name, match, mFilterExp);
 			if (found)
 			{
 				fname = name;