DRTVWR-476, SL-12205: Update to glod built with VS 2017 runtime libs.

3 files changed, 47 insertions, 99 deletions

diff --git a/autobuild.xml b/autobuild.xml
index 7c330cdf8a..439b7ef963 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1088,9 +1088,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>b618532b67f253d321329cfc7a1101e0</string>
+              <string>014f6dca98a0964a5d9de31a9fdf3333</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/44337/391697/glod-1.0pre3.531370-darwin64-531370.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/45956/405375/glod-1.0pre3.532346-darwin64-532346.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -1126,11 +1126,11 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>3be25680814037b801481dfc80850992</string>
+              <string>fe8215c04f959e703653a6133e142fd4</string>
               <key>hash_algorithm</key>
               <string>md5</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/44368/391838/glod-1.0pre3.531370-windows-531370.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/45955/405362/glod-1.0pre3.532346-windows-532346.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -1140,16 +1140,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>c896cb1a2a5d55f2d15877f557c1311b</string>
+              <string>77f7c414366a903e66769d7af31c42aa</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/44367/391831/glod-1.0pre3.531370-windows64-531370.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/45954/405349/glod-1.0pre3.532346-windows64-532346.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.0pre3.531370</string>
+        <string>1.0pre3.532346</string>
       </map>
       <key>google_breakpad</key>
       <map>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 1e33205143..c3309b2195 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -74,96 +74,57 @@ if(WINDOWS)
     #*******************************
     # Copy MS C runtime dlls, required for packaging.
     if (MSVC80)
-        list(APPEND LMSVC_VER 80)
-        list(APPEND LMSVC_VERDOT 8.0)
+        set(MSVC_VER 80)
     elseif (MSVC_VERSION EQUAL 1600) # VisualStudio 2010
         MESSAGE(STATUS "MSVC_VERSION ${MSVC_VERSION}")
     elseif (MSVC_VERSION EQUAL 1800) # VisualStudio 2013, which is (sigh) VS 12
-        list(APPEND LMSVC_VER 120)
-        list(APPEND LMSVC_VERDOT 12.0)
+        set(MSVC_VER 120)
     elseif (MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1920) # Visual Studio 2017
-        list(APPEND LMSVC_VER 150)
-        list(APPEND LMSVC_VERDOT 15.0)
+        set(MSVC_VER 140)
     else (MSVC80)
         MESSAGE(WARNING "New MSVC_VERSION ${MSVC_VERSION} of MSVC: adapt Copy3rdPartyLibs.cmake")
     endif (MSVC80)
 
-    # try to copy VS2010 redist independently of system version
-    # maint-7360 CP
-    # list(APPEND LMSVC_VER 100)
-    # list(APPEND LMSVC_VERDOT 10.0)
-    
-    list(LENGTH LMSVC_VER count)
-    math(EXPR count "${count}-1")
-    foreach(i RANGE ${count})
-        list(GET LMSVC_VER ${i} MSVC_VER)
-        list(GET LMSVC_VERDOT ${i} MSVC_VERDOT)
-        MESSAGE(STATUS "Copying redist libs for VC ${MSVC_VERDOT}")
-        FIND_PATH(debug_msvc_redist_path NAME msvcr${MSVC_VER}d.dll
-            PATHS            
-            [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${MSVC_VERDOT}\\Setup\\VC;ProductDir]/redist/Debug_NonRedist/x86/Microsoft.VC${MSVC_VER}.DebugCRT
-            [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64
-            [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32
-            ${MSVC_DEBUG_REDIST_PATH}
-            NO_DEFAULT_PATH
-            )
-
-        if(EXISTS ${debug_msvc_redist_path})
-            set(debug_msvc_files
-                msvcr${MSVC_VER}d.dll
-                msvcp${MSVC_VER}d.dll
-                )
-
-            copy_if_different(
-                ${debug_msvc_redist_path}
-                "${SHARED_LIB_STAGING_DIR_DEBUG}"
-                out_targets
-                ${debug_msvc_files}
-                )
-            set(third_party_targets ${third_party_targets} ${out_targets})
+    MESSAGE(STATUS "Copying redist libs for VC ${MSVC_VER}")
+    if(ADDRESS_SIZE EQUAL 32)
+        # this folder contains the 32bit DLLs.. (yes really!)
+        set(registry_find_path "[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64")
+    else(ADDRESS_SIZE EQUAL 32)
+        # this folder contains the 64bit DLLs.. (yes really!)
+        set(registry_find_path "[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32")
+    endif(ADDRESS_SIZE EQUAL 32)
+
+    FIND_PATH(release_msvc_redist_path NAME msvcr${MSVC_VER}.dll
+        PATHS            
+        ${registry_find_path}
+        NO_DEFAULT_PATH
+        )
 
-            unset(debug_msvc_redist_path CACHE)
-        endif()
+    if(EXISTS ${release_msvc_redist_path})
+        set(release_msvc_files
+            msvcp${MSVC_VER}.dll
+            msvcr${MSVC_VER}.dll
+            vcruntime${MSVC_VER}.dll
+            )
 
-        if(ADDRESS_SIZE EQUAL 32)
-            # this folder contains the 32bit DLLs.. (yes really!)
-            set(registry_find_path "[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/SysWOW64")
-        else(ADDRESS_SIZE EQUAL 32)
-            # this folder contains the 64bit DLLs.. (yes really!)
-            set(registry_find_path "[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32")
-        endif(ADDRESS_SIZE EQUAL 32)
+        copy_if_different(
+            ${release_msvc_redist_path}
+            "${SHARED_LIB_STAGING_DIR_RELEASE}"
+            out_targets
+            ${release_msvc_files}
+            )
+        set(third_party_targets ${third_party_targets} ${out_targets})
 
-        FIND_PATH(release_msvc_redist_path NAME msvcr${MSVC_VER}.dll
-            PATHS            
-            ${registry_find_path}
-            NO_DEFAULT_PATH
+        copy_if_different(
+            ${release_msvc_redist_path}
+            "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
+            out_targets
+            ${release_msvc_files}
             )
+        set(third_party_targets ${third_party_targets} ${out_targets})
 
-        if(EXISTS ${release_msvc_redist_path})
-            set(release_msvc_files
-                msvcr${MSVC_VER}.dll
-                msvcp${MSVC_VER}.dll
-                )
-
-            copy_if_different(
-                ${release_msvc_redist_path}
-                "${SHARED_LIB_STAGING_DIR_RELEASE}"
-                out_targets
-                ${release_msvc_files}
-                )
-            set(third_party_targets ${third_party_targets} ${out_targets})
-
-            copy_if_different(
-                ${release_msvc_redist_path}
-                "${SHARED_LIB_STAGING_DIR_RELWITHDEBINFO}"
-                out_targets
-                ${release_msvc_files}
-                )
-            set(third_party_targets ${third_party_targets} ${out_targets})
-
-            unset(release_msvc_redist_path CACHE)
-        endif()
-    endforeach()
+        unset(release_msvc_redist_path CACHE)
+    endif()
 
 elseif(DARWIN)
     set(SHARED_LIB_STAGING_DIR_DEBUG            "${SHARED_LIB_STAGING_DIR}/Debug/Resources")
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index bff18afd53..57099f8ac9 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -527,18 +527,8 @@ class WindowsManifest(ViewerManifest):
 
             # These need to be installed as a SxS assembly, currently a 'private' assembly.
             # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx
-            if self.args['configuration'].lower() == 'debug':
-                self.path("msvcr140d.dll")
-                self.path("msvcp140d.dll")
-            else:
-                # SL-12205: For reasons not yet diagnosed, an early build of
-                # the VS 2017 viewer requires VS 2013 runtime DLLs as well as
-                # VS 2017 runtime DLLs.
-                self.path("msvcr120.dll")
-                self.path("msvcp120.dll")
-                self.path("msvcr140.dll")
-                self.path("msvcp140.dll")
-                self.path("vcruntime140.dll")
+            self.path("msvcp140.dll")
+            self.path("vcruntime140.dll")
 
             # SLVoice executable
             with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')):
@@ -612,10 +602,7 @@ class WindowsManifest(ViewerManifest):
             # MSVC DLLs needed for CEF and have to be in same directory as plugin
             with self.prefix(src=os.path.join(self.args['build'], os.pardir,
                                               'sharedlibs', 'Release')):
-                self.path("msvcp120.dll")
-                self.path("msvcr120.dll")
                 self.path("msvcp140.dll")
-                self.path("msvcr140.dll")
                 self.path("vcruntime140.dll")
 
             # CEF files common to all configurations