From 3e8fbc8179775a6c5496dafab40e7db61bfafabd Mon Sep 17 00:00:00 2001 From: Router Gray Date: Sat, 30 Mar 2019 19:11:23 -0500 Subject: [PATCH 1/3] Update most Windows 32 prebuilts --- autobuild.xml | 78 +++++++++++++++--------------- indra/cmake/Copy3rdPartyLibs.cmake | 4 +- 2 files changed, 40 insertions(+), 42 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 78e8aa34f..3ea23a13e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -106,11 +106,11 @@ archive hash - 76186b09770cab66dba6586cb1d2123f + d0cf074a2c95a65b8833350dad77c0ae hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows/lib-vc14/apr_suite-1.5.2-windows-201603261507.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/apr_suite-1.5.2-windows-201703090634.tar.bz2 name windows @@ -278,11 +278,11 @@ archive hash - d606e5c39d13f2c23d23ac498520cbac + ae0998e5d108c77c5cea2a68ad928151 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows/lib-vc14/boost-1.60.0-windows-201601152308.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/boost-1.63.0-windows-201703281813.tar.bz2 name windows @@ -362,11 +362,11 @@ archive hash - 90a37cec15019bff53a165b90f0180a7 + 60bd2dbac5559141e05be6c424cf9cd0 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows/lib-vc14/colladadom-2.3-windows-201601152346.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/colladadom-2.3-windows-201703281922.tar.bz2 name windows @@ -448,11 +448,11 @@ archive hash - f20491b59795d311cf8d730556cd141e + da5be630ca350a7ed4c0e99250451d41 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows/lib-vc14/curl-7.48.0-windows-201603231720.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/curl-7.56.1-windows-201711241310.tar.bz2 name windows @@ -610,11 +610,11 @@ archive hash - 454170939e4d1ba07060b73d6f81b9fc + f10218f7c28d63a3d9f1fb683d116bf8 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows/lib-vc14/expat-2.1.1-windows-201603261409.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/expat-2.2.0-windows-201703090626.tar.bz2 name windows @@ -698,11 +698,11 @@ archive hash - fe50f650c97e6350bedfd90102d3321f + b23a30967666da49346983658ed50e92 hash_algorithm md5 url - https://depot.alchemyviewer.org/pub/windows/lib/fmodstudio-1.08.04-windows-201605291158.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib/fmodstudio-1.10.00-windows-201709290225.tar.bz2 name windows @@ -874,11 +874,11 @@ archive hash - e5be5197f12f9ca8078ba9ce4f1bce10 + bdbfc3b58cfc2f125881be748d092645 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows/lib-vc14/freetype-2.6.3-windows-201603011805.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/freetype-2.8.0-windows-201710192344.tar.bz2 name windows @@ -1024,11 +1024,11 @@ archive hash - 05134ab3cf05fbfb4bed996b53a0d472 + 37035aad7d066dfe6f26dc009aa9dcea hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows/lib-vc14/glod-1.0pre4-windows-201601151027.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/glod-1.0pre4-windows-201703090622.tar.bz2 name windows @@ -1110,11 +1110,11 @@ archive hash - 19147e19b5cfaaaeb83ff1d9025c06df + fa7f683ba4ddd7db777c78c8213d2e46 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows/lib-vc14/google_breakpad-9e60a27-windows-201601151025.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/google_breakpad-7398ce15b79da-windows-201703090621.tar.bz2 name windows @@ -1170,7 +1170,7 @@ hash e81d9e4526ceac49f1532d6518085985 url - https://bitbucket.org/alchemyviewer/publiclibs/downloads/gperftools-2.1-windows-20140120.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib/gperftools-2.1-windows-20140120.tar.bz2 name windows @@ -1324,11 +1324,11 @@ archive hash - 581db1bb70a7f6b9a6718121d22597a9 + a9a7af50c5c1b5319dfea82cd09fdd84 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows/lib-vc14/jpeglib-1.4.2-windows-201601151022.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/jpeglib-1.5.1-windows-201703090615.tar.bz2 name windows @@ -1410,11 +1410,11 @@ archive hash - 440a81e502be320c789337653ad1af7c + cfce0b7d65b28b34fd0643cbcf7b0bac hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows/lib-vc14/libhunspell-1.3.3-windows-201601151018.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/libhunspell-1.6.0-windows-201703090619.tar.bz2 name windows @@ -1516,11 +1516,11 @@ archive hash - 1bed832715f068e3363ba90a0415092f + e2927116641e2c74ada092bfb6b49a8d hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows/lib-vc14/libndofdev-0.1-windows-201601151016.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/libndofdev-0.1-windows-201703090613.tar.bz2 name windows @@ -1634,11 +1634,11 @@ archive hash - 5e7b3ea13fec60f6c9a8965a390cfbd5 + 9aad0afaf2c1895224454c1dc433f481 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows/lib-vc14/libpng-1.6.21-windows-201603011800.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/libpng-1.6.34-windows-201710172201.tar.bz2 name windows @@ -1720,11 +1720,11 @@ archive hash - 6f1e3fcceab669df5c3d1c66821b2f24 + a3f7c3421e9e4921dda3558c3b36dc59 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows/lib-vc14/libxml2-2.9.3-windows-201601151053.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/libxml2-2.9.4-windows-201703090740.tar.bz2 name windows @@ -2062,11 +2062,11 @@ archive hash - e8c42c8ee03d570fa5e7fb88e7e1bc92 + 41d090321853ea941c5ca57ba0d471d0 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows/lib-vc14/ogg_vorbis-1.3.2-1.3.5-windows-201601151012.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/ogg_vorbis-1.3.2-1.3.5-windows-201703090612.tar.bz2 name windows @@ -2236,11 +2236,11 @@ archive hash - 91b9fa570258f627a9265452d9e65231 + 0d25e1794f5d86b675484bf5eda799e4 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows/lib-vc14/openssl-1.0.2g-windows-201603011823.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/openssl-1.1.0g-windows-201711200028.tar.bz2 name windows @@ -2354,11 +2354,11 @@ archive hash - 47a3316dae47cc4e7c1ea7b74ba8dd1e + 5a78539626b5f23522d0b466247f48b4 hash_algorithm md5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/vivox_3p-slvoice/rev/302004/arch/CYGWIN/installer/slvoice-4.6.0017.22050.302004-windows-302004.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/21422/157291/slvoice-4.9.0002.30313.517593-windows-517593.tar.bz2 name windows @@ -2590,11 +2590,11 @@ archive hash - 7a619778a2ea5c3113549529dd4f7288 + 4cd5d80362fef95fe486b5bc1c373174 hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows/lib-vc14/xmlrpc_epi-0.54.2-windows-201603261505.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/xmlrpc_epi-0.54.2-windows-201703090632.tar.bz2 name windows @@ -2676,11 +2676,11 @@ archive hash - a26a7a9d550dc6988528e2e70bb5e85b + 75651f8b2fa45545461f73ba583180bb hash_algorithm md5 url - http://depot.alchemyviewer.org/pub/windows/lib-vc14/zlib-1.2.8-windows-201601150945.tar.bz2 + https://depot.alchemyviewer.org/pub/windows/lib-vc141/zlib-1.2.11-windows-201703090604.tar.bz2 name windows diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index e500ac753..4c9a830f0 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -20,11 +20,9 @@ if(WINDOWS) set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}") set(vivox_files SLVoice.exe - ca-bundle.crt - libsndfile-1.dll vivoxsdk.dll ortp.dll - vivoxoal.dll + vivoxplatform.dll ) #******************************* From 940994288ba6ed1349ce33a7540d953b40a802d1 Mon Sep 17 00:00:00 2001 From: Router Gray Date: Sat, 30 Mar 2019 19:11:56 -0500 Subject: [PATCH 2/3] [3:39 PM] CmdrCupcake: there is no /arch:SSE3 --- indra/cmake/00-Common.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index e9868cfea..32be5e4b4 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -108,7 +108,7 @@ if (WINDOWS) endif (USE_LTO) if (WORD_SIZE EQUAL 32) - add_compile_options(/arch:SSE3) + add_compile_options(/arch:SSE2) endif (WORD_SIZE EQUAL 32) if (NOT DISABLE_FATAL_WARNINGS) From c8a9efe5c8a798ebb4158c76db466cf5c95675b7 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sun, 31 Mar 2019 00:23:50 -0400 Subject: [PATCH 3/3] [OpenSim] Use x-grid-info everywhere, instead of old HTTPS thing --- indra/newview/llslurl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp index e4523889a..03f67b41d 100644 --- a/indra/newview/llslurl.cpp +++ b/indra/newview/llslurl.cpp @@ -61,8 +61,8 @@ const std::string MAIN_GRID_SLURL_BASE = "http://maps.secondlife.com/secondlife/ const std::string SYSTEM_GRID_APP_SLURL_BASE = "secondlife:///app"; const char* SYSTEM_GRID_SLURL_BASE = "secondlife://%s/secondlife/"; -const char* DEFAULT_SLURL_BASE = "https://%s/region/"; -const char* DEFAULT_APP_SLURL_BASE = "x-grid-location-info://%s/app"; +const char* DEFAULT_SLURL_BASE = "x-grid-info://%s/region/"; +const char* DEFAULT_APP_SLURL_BASE = "x-grid-info://%s/app"; #define MAINGRID "secondlife" // resolve a simstring from a slurl