Merge branch 'master' into DRTVWR-527-maint

# Conflicts:
#	autobuild.xml
#	indra/newview/installers/windows/lang_pl.nsi
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llinventorymodel.cpp

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llversioninfo.cpp b/indra/newview/llversioninfo.cpp
index 4720a989b0..376a7fce76 100644
--- a/indra/newview/llversioninfo.cpp
+++ b/indra/newview/llversioninfo.cpp
@@ -28,9 +28,9 @@
 #include "llviewerprecompiledheaders.h"
 #include "llevents.h"
 #include "lleventfilter.h"
+#include "llregex.h"
 #include "llversioninfo.h"
 #include "stringize.h"
-#include <boost/regex.hpp>
 
 #if ! defined(LL_VIEWER_CHANNEL)       \
  || ! defined(LL_VIEWER_VERSION_MAJOR) \
@@ -139,19 +139,19 @@ LLVersionInfo::ViewerMaturity LLVersionInfo::getViewerMaturity()
 	static const boost::regex is_project_channel("\\bProject\\b");
 	static const boost::regex is_release_channel("\\bRelease\\b");
 
-    if (boost::regex_search(channel, is_release_channel))
+    if (ll_regex_search(channel, is_release_channel))
     {
         maturity = RELEASE_VIEWER;
     }
-    else if (boost::regex_search(channel, is_beta_channel))
+    else if (ll_regex_search(channel, is_beta_channel))
     {
         maturity = BETA_VIEWER;
     }
-    else if (boost::regex_search(channel, is_project_channel))
+    else if (ll_regex_search(channel, is_project_channel))
     {
         maturity = PROJECT_VIEWER;
     }
-    else if (boost::regex_search(channel, is_test_channel))
+    else if (ll_regex_search(channel, is_test_channel))
     {
         maturity = TEST_VIEWER;
     }