Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R

# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/integration_tests/llui_libtest/CMakeLists.txt
#	indra/newview/CMakeLists.txt

1 files changed, 4 insertions, 2 deletions

diff --git a/indra/newview/llfloater360capture.cpp b/indra/newview/llfloater360capture.cpp
index eff94bd195..542a1ea39b 100644
--- a/indra/newview/llfloater360capture.cpp
+++ b/indra/newview/llfloater360capture.cpp
@@ -898,8 +898,10 @@ const std::string LLFloater360Capture::generate_proposed_filename()
         // this looks complex but it's straightforward - removes all non-alpha chars from a string
         // which in this case is the SL region name - we use it as a proposed filename but the user is free to change
         std::string region_name = region->getName();
-        std::replace_if(region_name.begin(), region_name.end(), std::not1(std::ptr_fun(isalnum)), '_');
-        if (region_name.length() > 0)
+        std::replace_if(region_name.begin(), region_name.end(),
+                        [](char c){ return ! std::isalnum(c); },
+                        '_');
+        if (! region_name.empty())
         {
             filename << region_name;
             filename << "_";